aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2012-07-30 14:10:22 -0700
committerTom Rini <trini@ti.com>2012-07-30 14:10:22 -0700
commit8c37046a587e175931b291e272c93c6d33d548b8 (patch)
tree595c4b1733f38f8aac88d68e046621d3be756231
parent8a869e667867e8e7b1e82dcb53ee75dd58805e81 (diff)
parentd4f5768ba2b31e47973535b522cbc4e43f8170ce (diff)
downloadopenembedded-8c37046a587e175931b291e272c93c6d33d548b8.zip
openembedded-8c37046a587e175931b291e272c93c6d33d548b8.tar.gz
openembedded-8c37046a587e175931b291e272c93c6d33d548b8.tar.bz2
Merge branch '2011.03-maintenance' of git://arago-project.org/git/people/denix/openembedded into 2011.03-maintenance
Conflicts: recipes/opkg-utils/opkg-utils_git.bb I had taken a commit that updated opkg-utils slightly, but not enough. Denys' commit brings everything back into line. Signed-off-by: Tom Rini <trini@ti.com>
-rw-r--r--recipes/opkg-utils/opkg-utils_git.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes/opkg-utils/opkg-utils_git.bb b/recipes/opkg-utils/opkg-utils_git.bb
index 75a1e9a..a9c9803 100644
--- a/recipes/opkg-utils/opkg-utils_git.bb
+++ b/recipes/opkg-utils/opkg-utils_git.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://opkg.py;beginline=1;endline=18;md5=15917491ad6bf7acc666ca5f7cc1e083"
RDEPENDS_${PN} = "python"
RDEPENDS_${PN}_virtclass-native = ""
-SRCREV = "423ecd36b4782327c16f516885d1248249c7724a"
+SRCREV = "49cc783d8e0415059d126ae22c892988717ffda7"
PV = "0.1.8+git${SRCPV}"
PR = "r2"