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-showrc.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-showrc.patch')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-showrc.patch | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-showrc.patch b/meta/recipes-devtools/rpm/rpm/rpm-showrc.patch index b38b34d9db..ec38b95f2e 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-showrc.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-showrc.patch @@ -4,10 +4,11 @@ Upstream-Status: Pending Signed-off-by: Mark Hatle <mark.hatle@windriver.com> -diff -ur rpm-5.4.0.orig/lib/rpmrc.c rpm-5.4.0/lib/rpmrc.c ---- rpm-5.4.0.orig/lib/rpmrc.c 2011-02-15 20:40:13.006853913 -0600 -+++ rpm-5.4.0/lib/rpmrc.c 2011-02-15 20:44:39.708972391 -0600 -@@ -1216,11 +1223,15 @@ +Index: rpm-5.4.14/lib/rpmrc.c +=================================================================== +--- rpm-5.4.14.orig/lib/rpmrc.c ++++ rpm-5.4.14/lib/rpmrc.c +@@ -1228,11 +1228,15 @@ int rpmShowRC(FILE * fp) if (DNEVR != NULL) fprintf(fp, " %s\n", DNEVR+2); } |