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/dbconvert.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/dbconvert.patch')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/dbconvert.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/dbconvert.patch b/meta/recipes-devtools/rpm/rpm/dbconvert.patch index 27dba8c960..78de7d99d2 100644 --- a/meta/recipes-devtools/rpm/rpm/dbconvert.patch +++ b/meta/recipes-devtools/rpm/rpm/dbconvert.patch @@ -3,20 +3,20 @@ Upstream-Status: Not applicable Hack to prevent unneeded demo app from building on older libc where it will break the build -Index: rpm-5.4.9/tools/Makefile.am +Index: rpm-5.4.14/tools/Makefile.am =================================================================== ---- rpm-5.4.9.orig/tools/Makefile.am -+++ rpm-5.4.9/tools/Makefile.am -@@ -24,7 +24,7 @@ AM_CFLAGS = $(OPENMP_CFLAGS) +--- rpm-5.4.14.orig/tools/Makefile.am ++++ rpm-5.4.14/tools/Makefile.am +@@ -29,7 +29,7 @@ EXTRA_PROGRAMS = nix-copy-closure nix-en + xiu-instantiate xiu-store + noinst_PROGRAMS = - EXTRA_DIST = hashtab.h bsdiff.1 bspatch.1 dotgraph.hh - --EXTRA_PROGRAMS = augtool cudftool dbconvert debugedit \ -+EXTRA_PROGRAMS = augtool cudftool debugedit \ - nix-build nix-channel nix-collect-garbage nix-copy-closure \ - nix-env nix-hash nix-install-package nix-instantiate \ - nix-log2xml nix-prefetch-url nix-pull nix-push nix-store nix-worker \ -@@ -60,7 +60,7 @@ pkgbin_PROGRAMS = \ +-EXTRA_PROGRAMS += augtool cudftool dbconvert debugedit \ ++EXTRA_PROGRAMS += augtool cudftool debugedit \ + nix-build nix-channel nix-collect-garbage \ + nix-log2xml nix-prefetch-url nix-pull nix-push \ + xiu-echo xiu-hash \ +@@ -64,7 +64,7 @@ pkgbin_PROGRAMS = \ rpmcache rpmdigest rpmrepo rpmspecdump \ rpmcmp rpmdeps rpmdeps-oecore sqlite3 @WITH_KEYUTILS_RPMKEY@ @WITH_LIBELF_DEBUGEDIT@ if WITH_DB |