diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2014-07-02 19:57:44 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-08 11:20:12 +0100 |
commit | fe483ca37c33ebfe4c3e391244c47969e1560aeb (patch) | |
tree | 4b703d42ad5b4c22f9075463c013e562ab649345 /meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch | |
parent | 107ef516a6b5dc8f6e4606d30e8fa204d75f0b21 (diff) | |
download | poky-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-resolvedep.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-resolvedep.patch | 10 |
1 files changed, 6 insertions, 4 deletions
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 | |||
7 | 7 | ||
8 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 8 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
9 | 9 | ||
10 | --- rpm-5.4.0.orig/lib/rpmts.c 2010-12-27 16:08:25.000000000 -0600 | 10 | Index: rpm-5.4.14/lib/rpmts.c |
11 | +++ rpm-5.4.0/lib/rpmts.c 2012-04-12 15:01:12.990184067 -0500 | 11 | =================================================================== |
12 | @@ -403,8 +403,8 @@ | 12 | --- rpm-5.4.14.orig/lib/rpmts.c |
13 | +++ rpm-5.4.14/lib/rpmts.c | ||
14 | @@ -410,8 +410,8 @@ fprintf(stderr, "--> %s(%p,%p,%p)\n", __ | ||
13 | if (sdb == NULL) | 15 | if (sdb == NULL) |
14 | continue; | 16 | continue; |
15 | 17 | ||
@@ -20,7 +22,7 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | |||
20 | mi = rpmmiInit(sdb, rpmtag, keyp, keylen); | 22 | mi = rpmmiInit(sdb, rpmtag, keyp, keylen); |
21 | while ((h = rpmmiNext(mi)) != NULL) { | 23 | while ((h = rpmmiNext(mi)) != NULL) { |
22 | size_t hnamelen; | 24 | size_t hnamelen; |
23 | @@ -439,6 +439,15 @@ | 25 | @@ -446,6 +446,15 @@ fprintf(stderr, "--> %s(%p,%p,%p)\n", __ |
24 | bhnamelen = hnamelen; | 26 | bhnamelen = hnamelen; |
25 | } | 27 | } |
26 | mi = rpmmiFree(mi); | 28 | mi = rpmmiFree(mi); |