[meta-lsi] [PATCH 13/26] rpm: Update to support db-6.2.23

[Daniel Dragomir]

ARMv8 tunes are supported just for a newer version of DB that cannot
work with the old version of rpm since there are some changes in
db locking semantics.
Untill a new version of rpm will be released with the fix, use as a workaround
the current version adapted to work (at least to build) with the new db.

NOTE: This isn't a fix, just a workaround. RPM archives are corupted.
http://lists.openembedded.org/pipermail/openembedded-core/2016-June/122456.html

Signed-off-by: Daniel Dragomir <daniel.dragomir at windriver.com>
Signed-off-by: Maxin B. John <maxin.john at intel.com>
---
 .../rpm/rpm/rpm-update-to-support-db-6.2.23.patch  | 41 ++++++++++++++++++++++
 recipes-devtools/rpm/rpm_5.4.16.bbappend           |  3 ++
 2 files changed, 44 insertions(+)
 create mode 100644 recipes-devtools/rpm/rpm/rpm-update-to-support-db-6.2.23.patch
 create mode 100644 recipes-devtools/rpm/rpm_5.4.16.bbappend

diff --git a/recipes-devtools/rpm/rpm/rpm-update-to-support-db-6.2.23.patch b/recipes-devtools/rpm/rpm/rpm-update-to-support-db-6.2.23.patch
new file mode 100644
index 0000000..64d3931
--- /dev/null
+++ b/recipes-devtools/rpm/rpm/rpm-update-to-support-db-6.2.23.patch
@@ -0,0 +1,41 @@
+Index: rpm-5.4.15/configure.ac
+===================================================================
+--- rpm-5.4.15.orig/configure.ac	2016-07-06 17:29:49.911817555 +0300
++++ rpm-5.4.15/configure.ac	2016-07-06 17:40:27.731816208 +0300
+@@ -2075,10 +2075,10 @@
+ ]])],
+ [RPM_CHECK_LIB(
+     [Berkeley-DB], [db],
+-    [db-6.0], [db_create], [db.h],
++    [db-6.2], [db_create], [db.h],
+     [yes,external], [db6],
+     [ DBLIBSRCS="$DBLIBSRCS db3.c"
+-      DBXY=db60
++      DBXY=db62
+       AM_CONDITIONAL(WITH_DB, [ true ])
+       AM_CONDITIONAL(WITH_DB_INTERNAL, [ test ".$RPM_CHECK_LIB_LOCATION" = .internal ])
+       if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
+@@ -2111,7 +2111,7 @@
+     ])
+ ])
+ 
+-if test ".$ac_cv_lib_db_6_0_db_create" != .yes -a ".$ac_cv_lib_db_5_3_db_create" != .yes; then
++if test ".$ac_cv_lib_db_6_2_db_create" != .yes -a ".$ac_cv_lib_db_5_3_db_create" != .yes; then
+     CPPFLAGS="${CPPFLAGS_save}"
+ fi
+ 
+@@ -2123,11 +2123,11 @@
+     [ DBLIBSRCS="$DBLIBSRCS sqlite.c" ],
+     [])
+ 
+-dnl # Sqlite 3.8.3.1 from db-6.0.30
+-if test ".$ac_cv_lib_db_6_0_db_create" = .yes; then
++dnl # Sqlite 3.8.3.1 from db-6.2.23
++if test ".$ac_cv_lib_db_6_2_db_create" = .yes; then
+ RPM_CHECK_LIB(
+     [Berkeley-DB (+SQLite3)], [dbsql],
+-    [db_sql-6.0], [sqlite3_open], [dbsql.h],
++    [db_sql-6.2], [sqlite3_open], [dbsql.h],
+     [yes,external], [db6/sql],
+     [
+       AM_CONDITIONAL(WITH_DBSQL, [ true ])
diff --git a/recipes-devtools/rpm/rpm_5.4.16.bbappend b/recipes-devtools/rpm/rpm_5.4.16.bbappend
new file mode 100644
index 0000000..ad5ee70
--- /dev/null
+++ b/recipes-devtools/rpm/rpm_5.4.16.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://rpm-update-to-support-db-6.2.23.patch"
-- 
2.7.4