aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorGraham Gower <graham.gower@gmail.com>2010-08-17 19:51:11 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2010-08-19 07:56:59 +0200
commit244ecae83fe79deb4cf409c275abeec470b3fcb4 (patch)
tree9da29fe6c55476f302d7616cef71cfd82426001a /conf
parent627570958bca0036626413761fc712cf463edd48 (diff)
downloadopenembedded-244ecae83fe79deb4cf409c275abeec470b3fcb4.tar.gz
openembedded-244ecae83fe79deb4cf409c275abeec470b3fcb4.tar.bz2
openembedded-244ecae83fe79deb4cf409c275abeec470b3fcb4.zip
rootfs_ipk.bbclass: Fix BAD_RECOMMENDATIONS - fix conflict resolution
Signed-off-by: Graham Gower <graham.gower@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/include/sane-srcrevs.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 19f93c6557..6efdd21b2e 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -1,5 +1,5 @@
# this is alphabetical!
# only SRCREVs included in more recipes should be here, otherwise put sane SRCREV to recipe directly
-OPKG_SRCREV ?= "550"
-EFL_SRCREV ?= "51276"
+OPKG_SRCREV ?= "554"
+EFL_SRCREV ?= "50438"