[oe-commits] Graham Gower : rootfs_ipk.bbclass: Fix BAD_RECOMMENDATIONS - fix conflict resolution

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 244ecae83fe79deb4cf409c275abeec470b3fcb4
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=244ecae83fe79deb4cf409c275abeec470b3fcb4

Author: Graham Gower <graham.gower at gmail.com>
Date:   Tue Aug 17 19:51:11 2010 +0000

rootfs_ipk.bbclass: Fix BAD_RECOMMENDATIONS - fix conflict resolution

Signed-off-by: Graham Gower <graham.gower at gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 conf/distro/include/sane-srcrevs.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 19f93c6..6efdd21 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"