[oe-commits] Michael Kurz : db{4, 5}.inc: fix QA: non -dev contains .so

git version control git at git.openembedded.org
Wed Sep 15 18:02:17 UTC 2010


Module: openembedded.git
Branch: master
Commit: 712280e02f077cf355fcbec6209e2fab220120cd
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=712280e02f077cf355fcbec6209e2fab220120cd

Author: Michael Kurz <betheg at bitcloner.org>
Date:   Mon Aug 23 22:18:45 2010 +0000

db{4,5}.inc: fix QA: non -dev contains .so

Signed-off-by: Michael Kurz <betheg at bitcloner.org>
Signed-off-by: Khem Raj <raj.khem at gmail.com>

---

 recipes/db/db4.inc |    3 +--
 recipes/db/db5.inc |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/recipes/db/db4.inc b/recipes/db/db4.inc
index 7e5c327..2595d81 100644
--- a/recipes/db/db4.inc
+++ b/recipes/db/db4.inc
@@ -43,12 +43,11 @@ B = "${WORKDIR}/db-${PV}/build_unix"
 PACKAGES += " ${PN}-bin"
 
 # Package contents
-FILES_${PN} = "${libdir}/libdb-4*so*"
+FILES_${PN} = "${libdir}/libdb-${PVM}${SOLIBSDEV}"
 FILES_${PN}-bin = "${bindir}/*"
 # The dev package has the .so link (as in db3) and the .a's -
 # it is therefore incompatible (cannot be installed at the
 # same time) as the db3 package
-FILES_${PN}-dev = "${includedir} ${libdir}/*"
 
 EXTRA_OECONF = "${DB4_CONFIG}"
 
diff --git a/recipes/db/db5.inc b/recipes/db/db5.inc
index 557cb4c..1aeee49 100644
--- a/recipes/db/db5.inc
+++ b/recipes/db/db5.inc
@@ -43,12 +43,11 @@ B = "${WORKDIR}/db-${PV}/build_unix"
 PACKAGES += " ${PN}-bin"
 
 # Package contents
-FILES_${PN} = "${libdir}/libdb-5*so*"
+FILES_${PN} = "${libdir}/libdb-${PVM}${SOLIBSDEV}"
 FILES_${PN}-bin = "${bindir}/*"
 # The dev package has the .so link (as in db3) and the .a's -
 # it is therefore incompatible (cannot be installed at the
 # same time) as the db3 package
-FILES_${PN}-dev = "${includedir} ${libdir}/*"
 
 EXTRA_OECONF = "${DB5_CONFIG}"
 





More information about the Openembedded-commits mailing list