[oe-commits] Alexander Kanavin : db: update to 6.1.26

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 419c7dfa9b864ac8ceb754ad5965518c36e545b1
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=419c7dfa9b864ac8ceb754ad5965518c36e545b1

Author: Alexander Kanavin <alexander.kanavin at linux.intel.com>
Date:   Wed Aug 12 19:28:12 2015 +0300

db: update to 6.1.26

To avoid breaking rpm, this patch needs to be applied together with
the patch that updates rpm to 5.4.15.

The include directory manipulation during install was updated to
match oe-core customizations to rpm's configure.ac.

Signed-off-by: Alexander Kanavin <alexander.kanavin at linux.intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/recipes-support/db/{db_6.0.30.bb => db_6.1.26.bb} | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/meta/recipes-support/db/db_6.0.30.bb b/meta/recipes-support/db/db_6.1.26.bb
similarity index 89%
rename from meta/recipes-support/db/db_6.0.30.bb
rename to meta/recipes-support/db/db_6.1.26.bb
index 9eae5c7..91fb1d4 100644
--- a/meta/recipes-support/db/db_6.0.30.bb
+++ b/meta/recipes-support/db/db_6.1.26.bb
@@ -21,8 +21,8 @@ SRC_URI += "file://arm-thumb-mutex_db5.patch;patchdir=.. \
             file://Makefile-let-libso_target-depend-on-bt_rec.patch \
            "
 
-SRC_URI[md5sum] = "ad28eb86ad3203b5422844db179c585b"
-SRC_URI[sha256sum] = "608e4b1cf390e9bf54c0ef00c5bd9ca76d36e2261b9f4d33d54516f3f6a20fd2"
+SRC_URI[md5sum] = "9525aa57a282d49e5d1bf5e48ffa8a56"
+SRC_URI[sha256sum] = "dd1417af5443f326ee3998e40986c3c60e2a7cfb5bfa25177ef7cadb2afb13a6"
 
 LIC_FILES_CHKSUM = "file://../LICENSE;md5=1ec8b0b17cc31513fe35ab10716f8490"
 
@@ -92,11 +92,11 @@ do_compile_prepend() {
 }
 
 do_install_append() {
-	mkdir -p ${D}/${includedir}/db60
-	mv ${D}/${includedir}/db.h ${D}/${includedir}/db60/.
-	mv ${D}/${includedir}/db_cxx.h ${D}/${includedir}/db60/.
-	ln -s db60/db.h ${D}/${includedir}/db.h
-	ln -s db60/db_cxx.h ${D}/${includedir}/db_cxx.h
+	mkdir -p ${D}/${includedir}/db-6.1
+	mv ${D}/${includedir}/db.h ${D}/${includedir}/db-6.1/.
+	mv ${D}/${includedir}/db_cxx.h ${D}/${includedir}/db-6.1/.
+	ln -s db-6.1/db.h ${D}/${includedir}/db.h
+	ln -s db-6.1/db_cxx.h ${D}/${includedir}/db_cxx.h
 
 	# The docs end up in /usr/docs - not right.
 	if test -d "${D}/${prefix}/docs"