summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2014-07-02 19:57:44 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-08 11:20:12 +0100
commitfe483ca37c33ebfe4c3e391244c47969e1560aeb (patch)
tree4b703d42ad5b4c22f9075463c013e562ab649345 /meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch
parent107ef516a6b5dc8f6e4606d30e8fa204d75f0b21 (diff)
downloadpoky-fe483ca37c33ebfe4c3e391244c47969e1560aeb.tar.gz
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 <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch')
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch9
1 files changed, 5 insertions, 4 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch b/meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch
index c4b4c03de8..ab6ed2c3a4 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch
@@ -4,10 +4,11 @@ Upstream-Status: Pending
4 4
5Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 5Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
6 6
7diff -urN rpm-5.4.0.orig/lib/order.c rpm-5.4.0/lib/order.c 7Index: rpm-5.4.14/lib/order.c
8--- rpm-5.4.0.orig/lib/order.c 2010-12-13 17:36:39.000000000 -0600 8===================================================================
9+++ rpm-5.4.0/lib/order.c 2011-08-10 11:11:43.194686332 -0500 9--- rpm-5.4.14.orig/lib/order.c
10@@ -2170,7 +2170,7 @@ 10+++ rpm-5.4.14/lib/order.c
11@@ -2175,7 +2175,7 @@ rescan:
11 const char * dp; 12 const char * dp;
12 rpmlogLvl msglvl = (anaconda || (rpmtsDFlags(ts) & RPMDEPS_FLAG_DEPLOOPS)) 13 rpmlogLvl msglvl = (anaconda || (rpmtsDFlags(ts) & RPMDEPS_FLAG_DEPLOOPS))
13 ? RPMLOG_WARNING : RPMLOG_ERR; 14 ? RPMLOG_WARNING : RPMLOG_ERR;