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-fileclass.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-fileclass.patch')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-fileclass.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-fileclass.patch b/meta/recipes-devtools/rpm/rpm/rpm-fileclass.patch index 1f948cd65a..b1db6fff72 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-fileclass.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-fileclass.patch @@ -11,11 +11,11 @@ Upstream-Status: Pending Signed-off-by: Mark Hatle <mark.hatle@windriver.com> -diff --git a/lib/rpmfc.c b/lib/rpmfc.c -index 0c3befd..9306999 100644 ---- a/lib/rpmfc.c -+++ b/lib/rpmfc.c -@@ -1692,7 +1692,6 @@ rpmRC rpmfcGenerateDepends(void * specp, void * pkgp) +Index: rpm-5.4.14/lib/rpmfc.c +=================================================================== +--- rpm-5.4.14.orig/lib/rpmfc.c ++++ rpm-5.4.14/lib/rpmfc.c +@@ -1734,7 +1734,6 @@ rpmRC rpmfcGenerateDepends(void * _spec, /* ... then generate dependencies using %{__find_requires} et al. */ rc = rpmfcGenerateDependsHelper(spec, pkg, fi); printDeps(pkg->header); @@ -23,7 +23,7 @@ index 0c3befd..9306999 100644 } /* Generate scriptlet Dependencies. */ -@@ -1720,8 +1719,8 @@ rpmRC rpmfcGenerateDepends(void * specp, void * pkgp) +@@ -1762,8 +1761,8 @@ rpmRC rpmfcGenerateDepends(void * _spec, av[ac] = NULL; fc = rpmfcNew(); |