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:19:48 +0100 |
| commit | 0c7b4a5e23836889196f85f472f081d51529e94e (patch) | |
| tree | f300a95188e10f51ddd30f53ee2eff73e92d41ff /meta/recipes-devtools/rpm/rpm/rpm-packageorigin.patch | |
| parent | 04bb223110da2f92725c341bc3ec0cf26325f675 (diff) | |
| download | openembedded-core-contrib-0c7b4a5e23836889196f85f472f081d51529e94e.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.
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] Signed-off-by: Mark Hatle <mark.hatle@windriver.com> -Index: rpm-5.4.8/rpmdb/hdrfmt.c +Index: rpm-5.4.14/rpmdb/hdrfmt.c =================================================================== ---- rpm-5.4.8.orig/rpmdb/hdrfmt.c -+++ rpm-5.4.8/rpmdb/hdrfmt.c -@@ -2403,8 +2403,10 @@ static int pkgoriginTag(Header h, HE_t +--- rpm-5.4.14.orig/rpmdb/hdrfmt.c ++++ rpm-5.4.14/rpmdb/hdrfmt.c +@@ -2409,8 +2409,10 @@ static int pkgoriginTag(Header h, HE_t h int rc = 1; he->tag = RPMTAG_PACKAGEORIGIN; |