From: Koen Kooi Date: Sat, 25 Apr 2009 07:40:53 +0000 (+0200) Subject: ecore: fix git merge damage X-Git-Tag: Release-2010-05/1~3676 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b4e61a4477f989075595660dc4737fb77b8b11f;p=openembedded.git ecore: fix git merge damage --- diff --git a/recipes/efl1/ecore.inc b/recipes/efl1/ecore.inc index 5078c550d1..bc4dcf38cf 100644 --- a/recipes/efl1/ecore.inc +++ b/recipes/efl1/ecore.inc @@ -10,7 +10,7 @@ inherit efl FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ecore" -PACKAGES += "\ +PACKAGES =+ "\ ${PN}-con \ ${PN}-config \ ${PN}-desktop \ diff --git a/recipes/efl1/ecore_svn.bb b/recipes/efl1/ecore_svn.bb index 7ef057ac77..716b96e883 100644 --- a/recipes/efl1/ecore_svn.bb +++ b/recipes/efl1/ecore_svn.bb @@ -1,5 +1,5 @@ require ecore.inc -PR = "r3" +PR = "r4" EXTRA_OECONF = "\ --x-includes=${STAGING_INCDIR}/X11 \