[oe-commits] Koen Kooi : ecore: fix git merge damage

[GIT User account]

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

Author: Koen Kooi <koen at openembedded.org>
Date:   Sat Apr 25 09:40:53 2009 +0200

ecore: fix git merge damage

---

 recipes/efl1/ecore.inc    |    2 +-
 recipes/efl1/ecore_svn.bb |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes/efl1/ecore.inc b/recipes/efl1/ecore.inc
index 5078c55..bc4dcf3 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 7ef057a..716b96e 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 \