diff options
author | Phil Blundell <philb@gnu.org> | 2009-06-15 10:12:00 +0100 |
---|---|---|
committer | Phil Blundell <philb@gnu.org> | 2009-06-15 10:12:00 +0100 |
commit | 96a0d3afc63adbae17f5b7965c02e9d7d87d6078 (patch) | |
tree | 42356c90a2e61f3f780dba8d82096eaab5ef5228 | |
parent | 87a447e42bb298e96cb3b10ced23d944454870a0 (diff) |
Revert "bitbake.conf, lib_package.bbclass: fix packaging of ${base_libdir}/*.so"
This reverts commit ba434bd1dc9dc8ed61953a1579ea9e993e81cbb2.
Acked-by: Richard Purdie, Leon Woestenberg
-rw-r--r-- | classes/lib_package.bbclass | 5 | ||||
-rw-r--r-- | conf/bitbake.conf | 5 |
2 files changed, 2 insertions, 8 deletions
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 \ |