From ba434bd1dc9dc8ed61953a1579ea9e993e81cbb2 Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Mon, 20 Apr 2009 11:42:08 +0200
Subject: bitbake.conf, lib_package.bbclass: fix packaging of
 ${base_libdir}/*.so

We need to include ${base_libdir}/*${SOLIBSDEV} in FILES_${PN]}  because
the shared libraries in ${base_libdir} do not follow the usual *.so.* naming
convention, for instance libproc-3.2.7.so.
---
 classes/lib_package.bbclass | 6 +++++-
 conf/bitbake.conf           | 7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/classes/lib_package.bbclass b/classes/lib_package.bbclass
index 03ba9d094f..f866d10951 100644
--- a/classes/lib_package.bbclass
+++ b/classes/lib_package.bbclass
@@ -1,8 +1,12 @@
 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} ${datadir}/${PN} ${libdir}/${PN}"
+	    ${base_libdir}/*${SOLIBS} ${base_libdir}/*{SOLIBSDEV} \
+	    ${datadir}/${PN} ${libdir}/${PN}"
 FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
 		${libdir}/*.a ${libdir}/pkgconfig /lib/*.a /lib/*.o \
 		${datadir}/aclocal ${bindir}/*-config"
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 30ee0ae9bc..41e9c051eb 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -211,9 +211,14 @@ 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} ${datadir}/${PN} ${libdir}/${PN}/* \
+            ${base_bindir}/* ${base_sbindir}/* \
+            ${base_libdir}/*${SOLIBS} ${base_libdir}/*{SOLIBSDEV} \
+            ${datadir}/${PN} ${libdir}/${PN}/* \
             ${datadir}/pixmaps ${datadir}/applications \
             ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
             ${libdir}/bonobo/servers"
-- 
cgit 1.2.3-korg