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-packageorigin.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-packageorigin.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch b/meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch index 7e090a3442..c15e12405d 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch | |||
@@ -6,11 +6,11 @@ Upstream-Status: Inappropriate [not author] | |||
6 | 6 | ||
7 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 7 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
8 | 8 | ||
9 | Index: rpm-5.4.8/rpmdb/hdrfmt.c | 9 | Index: rpm-5.4.14/rpmdb/hdrfmt.c |
10 | =================================================================== | 10 | =================================================================== |
11 | --- rpm-5.4.8.orig/rpmdb/hdrfmt.c | 11 | --- rpm-5.4.14.orig/rpmdb/hdrfmt.c |
12 | +++ rpm-5.4.8/rpmdb/hdrfmt.c | 12 | +++ rpm-5.4.14/rpmdb/hdrfmt.c |
13 | @@ -2403,8 +2403,10 @@ static int pkgoriginTag(Header h, HE_t | 13 | @@ -2409,8 +2409,10 @@ static int pkgoriginTag(Header h, HE_t h |
14 | int rc = 1; | 14 | int rc = 1; |
15 | 15 | ||
16 | he->tag = RPMTAG_PACKAGEORIGIN; | 16 | he->tag = RPMTAG_PACKAGEORIGIN; |