[PATCH 1/2] db{4,5}.inc: fix QA: non -dev contains .so

[PATCH 1/2] db{4,5}.inc: fix QA: non -dev contains .so

[Michael Kurz]

Signed-off-by: Michael Kurz <betheg@bitcloner.org>
---
 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}"
 
-- 
1.7.1

[PATCH 2/2] db_{4.3.29, 5.0.21}.bb: increase PR to force a rebuild.

[Michael Kurz]

Signed-off-by: Michael Kurz <betheg@bitcloner.org>
---
 recipes/db/db_4.3.29.bb |    2 +-
 recipes/db/db_5.0.21.bb |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes/db/db_4.3.29.bb b/recipes/db/db_4.3.29.bb
index 1e54203..08ca12d 100644
--- a/recipes/db/db_4.3.29.bb
+++ b/recipes/db/db_4.3.29.bb
@@ -1,4 +1,4 @@
-PR = "r11"
+PR = "r12"
 
 # major version number
 PVM = "4.3"
diff --git a/recipes/db/db_5.0.21.bb b/recipes/db/db_5.0.21.bb
index cfa0154..a25b558 100644
--- a/recipes/db/db_5.0.21.bb
+++ b/recipes/db/db_5.0.21.bb
@@ -1,4 +1,4 @@
-PR = "r0"
+PR = "r1"
 
 # major version number
 PVM = "5.0"
-- 
1.7.1