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/dbconvert.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/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 | |||
| 3 | Hack to prevent unneeded demo app from building on older libc | 3 | Hack to prevent unneeded demo app from building on older libc |
| 4 | where it will break the build | 4 | where it will break the build |
| 5 | 5 | ||
| 6 | Index: rpm-5.4.9/tools/Makefile.am | 6 | Index: rpm-5.4.14/tools/Makefile.am |
| 7 | =================================================================== | 7 | =================================================================== |
| 8 | --- rpm-5.4.9.orig/tools/Makefile.am | 8 | --- rpm-5.4.14.orig/tools/Makefile.am |
| 9 | +++ rpm-5.4.9/tools/Makefile.am | 9 | +++ rpm-5.4.14/tools/Makefile.am |
| 10 | @@ -24,7 +24,7 @@ AM_CFLAGS = $(OPENMP_CFLAGS) | 10 | @@ -29,7 +29,7 @@ EXTRA_PROGRAMS = nix-copy-closure nix-en |
| 11 | xiu-instantiate xiu-store | ||
| 12 | noinst_PROGRAMS = | ||
| 11 | 13 | ||
| 12 | EXTRA_DIST = hashtab.h bsdiff.1 bspatch.1 dotgraph.hh | 14 | -EXTRA_PROGRAMS += augtool cudftool dbconvert debugedit \ |
| 13 | 15 | +EXTRA_PROGRAMS += augtool cudftool debugedit \ | |
| 14 | -EXTRA_PROGRAMS = augtool cudftool dbconvert debugedit \ | 16 | nix-build nix-channel nix-collect-garbage \ |
| 15 | +EXTRA_PROGRAMS = augtool cudftool debugedit \ | 17 | nix-log2xml nix-prefetch-url nix-pull nix-push \ |
| 16 | nix-build nix-channel nix-collect-garbage nix-copy-closure \ | 18 | xiu-echo xiu-hash \ |
| 17 | nix-env nix-hash nix-install-package nix-instantiate \ | 19 | @@ -64,7 +64,7 @@ pkgbin_PROGRAMS = \ |
| 18 | nix-log2xml nix-prefetch-url nix-pull nix-push nix-store nix-worker \ | ||
| 19 | @@ -60,7 +60,7 @@ pkgbin_PROGRAMS = \ | ||
| 20 | rpmcache rpmdigest rpmrepo rpmspecdump \ | 20 | rpmcache rpmdigest rpmrepo rpmspecdump \ |
| 21 | rpmcmp rpmdeps rpmdeps-oecore sqlite3 @WITH_KEYUTILS_RPMKEY@ @WITH_LIBELF_DEBUGEDIT@ | 21 | rpmcmp rpmdeps rpmdeps-oecore sqlite3 @WITH_KEYUTILS_RPMKEY@ @WITH_LIBELF_DEBUGEDIT@ |
| 22 | if WITH_DB | 22 | if WITH_DB |