[oe-commits] Koen Kooi : e* bbclass: fix up PACKAGES (again!)

[git version control]

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

Author: Koen Kooi <koen at openembedded.org>
Date:   Wed Nov  4 10:11:42 2009 +0100

e* bbclass: fix up PACKAGES (again!)

This should why overriding PACKAGES is bad

---

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

diff --git a/classes/e.bbclass b/classes/e.bbclass
index a6fa1d0..fca9aa0 100644
--- a/classes/e.bbclass
+++ b/classes/e.bbclass
@@ -23,7 +23,7 @@ export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config"
 
 # This construction is stupid, someone with more E knowledge should change it to =+ or something
 # And it's in efl.bbclass as well....
-PACKAGES = "${PN}-dbg ${PN}-themes ${PN} ${PN}-dev ${PN}-doc ${PN}-lib"
+PACKAGES = "${PN}-dbg ${PN}-themes ${PN} ${PN}-dev ${PN}-doc ${PN}-lib ${PN}-static"
 FILES_${PN}-lib = "${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} ${libdir}/lib*.so"
diff --git a/classes/efl.bbclass b/classes/efl.bbclass
index 22e664c..d4c3baa 100644
--- a/classes/efl.bbclass
+++ b/classes/efl.bbclass
@@ -24,7 +24,7 @@ do_stage() {
 }
 
 # This construction is stupid, someone with more E knowledge should change it to =+ or something
-PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-doc ${PN}-tests"
+PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-doc ${PN}-tests ${PN}-static"
 
 FILES_${PN} = "${libdir}/*.so.*"
 
@@ -40,13 +40,14 @@ FILES_${PN}-themes = "${datadir}/${PN}/themes \
 FILES_${PN}-dev   += "${bindir}/${PN}-config \
                       ${libdir}/pkgconfig/* \
                       ${libdir}/lib*.la \
-                      ${libdir}/lib*.a \
                       ${libdir}/*.so \
-                      ${libdir}/${PN}/*.a \
                       ${libdir}/${PN}/*.la \
-                      ${libdir}/${PN}/*/*.a \
                       ${libdir}/${PN}/*/*.la"
 
+FILES_${PN}-static += "${libdir}/${PN}/*.a \
+                       ${libdir}/${PN}/*/*.a \
+"
+
 FILES_${PN}-dbg +=   "${libdir}/${PN}/.debug \
                       ${libdir}/${PN}/*/.debug"