[oe-commits] Phil Blundell : Revert "bitbake.conf, lib_package.bbclass: fix packaging of ${base_libdir}/*.so"

[git version control]

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

Author: Phil Blundell <philb at gnu.org>
Date:   Mon Jun 15 10:12:00 2009 +0100

Revert "bitbake.conf, lib_package.bbclass: fix packaging of ${base_libdir}/*.so"
This reverts commit ba434bd1dc9dc8ed61953a1579ea9e993e81cbb2.

Acked-by: Richard Purdie, Leon Woestenberg

---

 classes/lib_package.bbclass |    5 +----
 conf/bitbake.conf           |    5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/classes/lib_package.bbclass b/classes/lib_package.bbclass
index 788b7bb..82c9370 100644
--- a/classes/lib_package.bbclass
+++ b/classes/lib_package.bbclass
@@ -1,11 +1,8 @@
 PACKAGES += "${PN}-bin"
 
-# NB: ${base_libdir}/*${SOLIBSDEV} is included here because the shared libraries
-# in ${base_libdir} do not follow the usual *.so.* naming convention, for instance
-# libproc-3.2.7.so
 FILES_${PN} = "${libexecdir} ${libdir}/lib*${SOLIBS} \
 	    ${sysconfdir} ${sharedstatedir} ${localstatedir} \
-	    ${base_libdir}/*${SOLIBS} ${base_libdir}/*${SOLIBSDEV} \
+	    ${base_libdir}/*${SOLIBS} \
 	    ${datadir}/${PN} ${libdir}/${PN}"
 FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
 		${libdir}/*.a ${libdir}/pkgconfig /lib/*.a /lib/*.o \
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 5107e69..077e8e1 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -211,13 +211,10 @@ PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
 PACKAGES_DYNAMIC = "${PN}-locale-*"
 FILES = ""
 
-# NB: ${base_libdir}/*${SOLIBSDEV} is included here because the shared libraries
-# in ${base_libdir} do not follow the usual *.so.* naming convention, for instance
-# libproc-3.2.7.so
 FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \
             ${sysconfdir} ${sharedstatedir} ${localstatedir} \
             ${base_bindir}/* ${base_sbindir}/* \
-            ${base_libdir}/*${SOLIBS} ${base_libdir}/*${SOLIBSDEV} \
+            ${base_libdir}/*${SOLIBS} \
             ${datadir}/${PN} ${libdir}/${PN}/* \
             ${datadir}/pixmaps ${datadir}/applications \
             ${datadir}/idl ${datadir}/omf ${datadir}/sounds \