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-resolvedep.patch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch') diff --git a/meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch b/meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch index d272fe9cff..56a243d5f7 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch @@ -7,9 +7,11 @@ Upstream-Status: Pending Signed-off-by: Mark Hatle ---- rpm-5.4.0.orig/lib/rpmts.c 2010-12-27 16:08:25.000000000 -0600 -+++ rpm-5.4.0/lib/rpmts.c 2012-04-12 15:01:12.990184067 -0500 -@@ -403,8 +403,8 @@ +Index: rpm-5.4.14/lib/rpmts.c +=================================================================== +--- rpm-5.4.14.orig/lib/rpmts.c ++++ rpm-5.4.14/lib/rpmts.c +@@ -410,8 +410,8 @@ fprintf(stderr, "--> %s(%p,%p,%p)\n", __ if (sdb == NULL) continue; @@ -20,7 +22,7 @@ Signed-off-by: Mark Hatle mi = rpmmiInit(sdb, rpmtag, keyp, keylen); while ((h = rpmmiNext(mi)) != NULL) { size_t hnamelen; -@@ -439,6 +439,15 @@ +@@ -446,6 +446,15 @@ fprintf(stderr, "--> %s(%p,%p,%p)\n", __ bhnamelen = hnamelen; } mi = rpmmiFree(mi); -- cgit v1.2.3-54-g00ecf