From: Phil Blundell <philb@gnu.org>
Date: Mon, 15 Jun 2009 09:12:00 +0000 (+0100)
Subject: Revert "bitbake.conf, lib_package.bbclass: fix packaging of ${base_libdir}/*.so"
X-Git-Tag: Release-2010-05/1~3153
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96a0d3afc63adbae17f5b7965c02e9d7d87d6078;p=openembedded.git

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

Acked-by: Richard Purdie, Leon Woestenberg
---

diff --git a/classes/lib_package.bbclass b/classes/lib_package.bbclass
index 788b7bb0c4..82c93707ea 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 5107e69786..077e8e1e9a 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 \