From dd93941fb352cdb677139768974edcaa4980b45a Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Sat, 16 Jun 2007 11:51:26 +0000
Subject: sdk.bbclass: Remove unneeded PACKAGES, use DISTRO in SDK_NAME, set
 PACKAGE_ARCH to something which doesn't conflict with normal packages (from
 Poky)

---
 classes/sdk.bbclass | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'classes')

diff --git a/classes/sdk.bbclass b/classes/sdk.bbclass
index 834081fccc..38df66eb4d 100644
--- a/classes/sdk.bbclass
+++ b/classes/sdk.bbclass
@@ -2,8 +2,10 @@
 # or indirectly via dependency.  No need to be in 'world'.
 EXCLUDE_FROM_WORLD = "1"
 
-SDK_NAME = "${TARGET_ARCH}/oe"
-PACKAGE_ARCH = "${BUILD_ARCH}"
+SDK_NAME = "${DISTRO}/${TARGET_ARCH}"
+
+OLD_PACKAGE_ARCH := ${PACKAGE_ARCH}
+PACKAGE_ARCH = "${BUILD_ARCH}-${OLD_PACKAGE_ARCH}-sdk"
 
 HOST_ARCH = "${BUILD_ARCH}"
 HOST_VENDOR = "${BUILD_VENDOR}"
@@ -20,11 +22,7 @@ prefix = "/usr/local/${SDK_NAME}"
 exec_prefix = "${prefix}"
 base_prefix = "${exec_prefix}"
 
-PACKAGES =+ "${PN}-dbg"
-
 FILES_${PN} = "${prefix}"
 FILES_${PN}-dbg += "${prefix}/bin/.debug \
                     ${prefix}/sbin/.debug \
                    "
-
-
-- 
cgit v1.2.3


From 17c5e701a1eb2969aab3bb5f29ada08e3b10544e Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 16 Jun 2007 14:57:49 +0000
Subject: e.bbclass: unbreak packaging

---
 classes/e.bbclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'classes')

diff --git a/classes/e.bbclass b/classes/e.bbclass
index 59f2771027..431171c95e 100644
--- a/classes/e.bbclass
+++ b/classes/e.bbclass
@@ -27,7 +27,7 @@ export IMLIB2_CONFIG		= "${STAGING_BINDIR_CROSS}/imlib2-config"
 #	find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:'
 #}
 
-PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev"
-FILES_${PN} = "${libdir}/lib*.so*"
+PACKAGES = "{PN}-dbg ${PN}-themes ${PN} ${PN}-dev"
+FILES_${PN} += "${libdir}/lib*.so.*"
 FILES_${PN}-themes = "${datadir}/${PN}/themes ${datadir}/${PN}/data ${datadir}/${PN}/fonts ${datadir}/${PN}/pointers ${datadir}/${PN}/images ${datadir}/${PN}/users ${datadir}/${PN}/images ${datadir}/${PN}/styles"
-FILES_${PN}-dev += "${includedir}"
\ No newline at end of file
+FILES_${PN}-dev += "${includedir}"
-- 
cgit v1.2.3


From ae9ebc2b9d0d5e130e463f2af60d51019c593ef2 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sat, 16 Jun 2007 14:59:52 +0000
Subject: e.bbclass: fix typo

---
 classes/e.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'classes')

diff --git a/classes/e.bbclass b/classes/e.bbclass
index 431171c95e..efbc13633f 100644
--- a/classes/e.bbclass
+++ b/classes/e.bbclass
@@ -27,7 +27,7 @@ export IMLIB2_CONFIG		= "${STAGING_BINDIR_CROSS}/imlib2-config"
 #	find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:'
 #}
 
-PACKAGES = "{PN}-dbg ${PN}-themes ${PN} ${PN}-dev"
+PACKAGES = "${PN}-dbg ${PN}-themes ${PN} ${PN}-dev"
 FILES_${PN} += "${libdir}/lib*.so.*"
 FILES_${PN}-themes = "${datadir}/${PN}/themes ${datadir}/${PN}/data ${datadir}/${PN}/fonts ${datadir}/${PN}/pointers ${datadir}/${PN}/images ${datadir}/${PN}/users ${datadir}/${PN}/images ${datadir}/${PN}/styles"
 FILES_${PN}-dev += "${includedir}"
-- 
cgit v1.2.3


From 6bf558d5065297cb8e4c0b11b7aa39779e89253b Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Sat, 16 Jun 2007 18:00:25 +0000
Subject: efl, e: update for better packaging

---
 classes/e.bbclass   | 3 ++-
 classes/efl.bbclass | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'classes')

diff --git a/classes/e.bbclass b/classes/e.bbclass
index efbc13633f..9bac65fd9c 100644
--- a/classes/e.bbclass
+++ b/classes/e.bbclass
@@ -30,4 +30,5 @@ export IMLIB2_CONFIG		= "${STAGING_BINDIR_CROSS}/imlib2-config"
 PACKAGES = "${PN}-dbg ${PN}-themes ${PN} ${PN}-dev"
 FILES_${PN} += "${libdir}/lib*.so.*"
 FILES_${PN}-themes = "${datadir}/${PN}/themes ${datadir}/${PN}/data ${datadir}/${PN}/fonts ${datadir}/${PN}/pointers ${datadir}/${PN}/images ${datadir}/${PN}/users ${datadir}/${PN}/images ${datadir}/${PN}/styles"
-FILES_${PN}-dev += "${includedir}"
+FILES_${PN}-dev += "${includedir} ${libdir}/lib*.so"
+
diff --git a/classes/efl.bbclass b/classes/efl.bbclass
index 9b0345a5b8..808bf2eaae 100644
--- a/classes/efl.bbclass
+++ b/classes/efl.bbclass
@@ -48,6 +48,5 @@ do_stage_append () {
 }
 
 PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-examples"
-FILES_${PN}-dev = "${bindir}/${PN}-config ${libdir}/pkgconfig ${libdir}/lib*.?a ${libdir}/lib*.a ${includedir}"
+FILES_${PN}-dev += "${bindir}/${PN}-config ${libdir}/pkgconfig ${libdir}/lib*.?a ${libdir}/lib*.a"
 FILES_${PN}-examples = "${bindir} ${datadir}"
-
-- 
cgit v1.2.3