From 244ecae83fe79deb4cf409c275abeec470b3fcb4 Mon Sep 17 00:00:00 2001
From: Graham Gower <graham.gower@gmail.com>
Date: Tue, 17 Aug 2010 19:51:11 +0000
Subject: 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>
---
 conf/distro/include/sane-srcrevs.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'conf')

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"
-- 
cgit 1.2.3-korg