From fe483ca37c33ebfe4c3e391244c47969e1560aeb Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 2 Jul 2014 19:57:44 -0500 Subject: rpm: Upgrade to 5.4.14 Update various patches. A few corrections to the patch descriptions, otherwise simple quilt refresh or conflict resolution. Remove rpm-solvedb.patch and rpm-respect-arch.patch. These are both related to the old solvedb package dependency solver. This is no longer used since we moved to smartpm. rpm-stub-out-git_strerror was a backport and is no longer needed. RPM 5.4.12 and newer normally requires Berkley DB 6.0 or newer. A small patch to configure allows RPM to dynamically select DB 5.3 or DB 6.0 based on what is available at configure time. (From OE-Core rev: 0c7b4a5e23836889196f85f472f081d51529e94e) Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch') diff --git a/meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch b/meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch index b5ff2637c2..042e412ede 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-libsql-fix.patch @@ -6,11 +6,13 @@ Upstream-Status: Pending Signed-off-by: Mark Hatle ---- rpm-5.4.0/lib/Makefile.am.orig -+++ rpm-5.4.0/lib/Makefile.am -@@ -90,6 +90,9 @@ - libsql_la_SOURCES = libsql.c - libsql_la_LIBADD = librpm.la $(RPMDB_LDADD_COMMON) +Index: rpm-5.4.14/lib/Makefile.am +=================================================================== +--- rpm-5.4.14.orig/lib/Makefile.am ++++ rpm-5.4.14/lib/Makefile.am +@@ -120,6 +120,9 @@ librpm.la: $(librpm_la_OBJECTS) $(librpm + #libsql_la_SOURCES = libsql.c + #libsql_la_LIBADD = librpm.la $(RPMDB_LDADD_COMMON) +# pkglib libraries needs to have usrlib libraries already installed! +install-pkglibLTLIBRARIES: install-usrlibLTLIBRARIES -- cgit v1.2.3-54-g00ecf