summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2009-04-25 09:40:53 +0200
committerKoen Kooi <koen@openembedded.org>2009-04-25 09:40:53 +0200
commit9b4e61a4477f989075595660dc4737fb77b8b11f (patch)
treed3c76435e724ec4a5e8a6a3ab6f4e870f0834f49
parent46c34116ecaefae4baf3a1ff4d726f40551fe5e3 (diff)
ecore: fix git merge damage
-rw-r--r--recipes/efl1/ecore.inc2
-rw-r--r--recipes/efl1/ecore_svn.bb2
2 files changed, 2 insertions, 2 deletions
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 \