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/rpmdeps-oecore.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/rpmdeps-oecore.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpmdeps-oecore.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpmdeps-oecore.patch b/meta/recipes-devtools/rpm/rpm/rpmdeps-oecore.patch index f29866b934..9bdd1d4908 100644 --- a/meta/recipes-devtools/rpm/rpm/rpmdeps-oecore.patch +++ b/meta/recipes-devtools/rpm/rpm/rpmdeps-oecore.patch | |||
@@ -16,11 +16,11 @@ RP 2012/2/7 | |||
16 | 2 files changed, 152 insertions(+), 1 deletions(-) | 16 | 2 files changed, 152 insertions(+), 1 deletions(-) |
17 | create mode 100644 tools/rpmdeps-oecore.c | 17 | create mode 100644 tools/rpmdeps-oecore.c |
18 | 18 | ||
19 | Index: rpm-5.4.9/tools/Makefile.am | 19 | Index: rpm-5.4.14/tools/Makefile.am |
20 | =================================================================== | 20 | =================================================================== |
21 | --- rpm-5.4.9.orig/tools/Makefile.am | 21 | --- rpm-5.4.14.orig/tools/Makefile.am |
22 | +++ rpm-5.4.9/tools/Makefile.am | 22 | +++ rpm-5.4.14/tools/Makefile.am |
23 | @@ -58,7 +58,7 @@ pkgbin_PROGRAMS = \ | 23 | @@ -62,7 +62,7 @@ pkgbin_PROGRAMS = \ |
24 | @WITH_AUGEAS_AUGTOOL@ chroot cp @WITH_CUDF_CUDFTOOL@ find mtree \ | 24 | @WITH_AUGEAS_AUGTOOL@ chroot cp @WITH_CUDF_CUDFTOOL@ find mtree \ |
25 | @WITH_SEMANAGE_SEMODULE@ wget \ | 25 | @WITH_SEMANAGE_SEMODULE@ wget \ |
26 | rpmcache rpmdigest rpmrepo rpmspecdump \ | 26 | rpmcache rpmdigest rpmrepo rpmspecdump \ |
@@ -29,7 +29,7 @@ Index: rpm-5.4.9/tools/Makefile.am | |||
29 | if WITH_DB | 29 | if WITH_DB |
30 | pkgbin_PROGRAMS += dbconvert | 30 | pkgbin_PROGRAMS += dbconvert |
31 | endif | 31 | endif |
32 | @@ -168,6 +168,10 @@ rpmdeps_SOURCES = rpmdeps.c | 32 | @@ -172,6 +172,10 @@ rpmdeps_SOURCES = rpmdeps.c |
33 | rpmdeps_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) | 33 | rpmdeps_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) |
34 | rpmdeps_LDADD = $(RPM_LDADD_COMMON) | 34 | rpmdeps_LDADD = $(RPM_LDADD_COMMON) |
35 | 35 | ||
@@ -40,10 +40,10 @@ Index: rpm-5.4.9/tools/Makefile.am | |||
40 | rpmdigest_SOURCES = rpmdigest.c | 40 | rpmdigest_SOURCES = rpmdigest.c |
41 | rpmdigest_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) | 41 | rpmdigest_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) |
42 | rpmdigest_LDADD = $(RPMIO_LDADD_COMMON) | 42 | rpmdigest_LDADD = $(RPMIO_LDADD_COMMON) |
43 | Index: rpm-5.4.9/tools/rpmdeps-oecore.c | 43 | Index: rpm-5.4.14/tools/rpmdeps-oecore.c |
44 | =================================================================== | 44 | =================================================================== |
45 | --- /dev/null | 45 | --- /dev/null |
46 | +++ rpm-5.4.9/tools/rpmdeps-oecore.c | 46 | +++ rpm-5.4.14/tools/rpmdeps-oecore.c |
47 | @@ -0,0 +1,147 @@ | 47 | @@ -0,0 +1,147 @@ |
48 | +#include "system.h" | 48 | +#include "system.h" |
49 | +const char *__progname; | 49 | +const char *__progname; |