From bc4a29df84542f0ef905a2e20d8533a0ea7cb613 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Mon, 11 Jun 2012 13:18:53 -0500 Subject: rpm: Upgrade RPM to 5.4.9 Beside upreving RPM, add necessary integration patches to libzypp. Also change the configuration of RPM to support PACKAGECONFIG flags. RPM is highly configurable, the default configuration is good for minimal OE-Core use. (From OE-Core rev: bf94103d4c532ffdfdcdcc6d27c9f65f7824f8f8) Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/recipes-devtools/rpm/rpm/rpmdeps-oecore.patch | 26 +++++++++------------- 1 file changed, 11 insertions(+), 15 deletions(-) (limited to 'meta/recipes-devtools/rpm/rpm/rpmdeps-oecore.patch') diff --git a/meta/recipes-devtools/rpm/rpm/rpmdeps-oecore.patch b/meta/recipes-devtools/rpm/rpm/rpmdeps-oecore.patch index 1667901b63..f29866b934 100644 --- a/meta/recipes-devtools/rpm/rpm/rpmdeps-oecore.patch +++ b/meta/recipes-devtools/rpm/rpm/rpmdeps-oecore.patch @@ -16,20 +16,20 @@ RP 2012/2/7 2 files changed, 152 insertions(+), 1 deletions(-) create mode 100644 tools/rpmdeps-oecore.c -diff --git a/tools/Makefile.am b/tools/Makefile.am -index f520843..2eba9bf 100644 ---- a/tools/Makefile.am -+++ b/tools/Makefile.am +Index: rpm-5.4.9/tools/Makefile.am +=================================================================== +--- rpm-5.4.9.orig/tools/Makefile.am ++++ rpm-5.4.9/tools/Makefile.am @@ -58,7 +58,7 @@ pkgbin_PROGRAMS = \ @WITH_AUGEAS_AUGTOOL@ chroot cp @WITH_CUDF_CUDFTOOL@ find mtree \ @WITH_SEMANAGE_SEMODULE@ wget \ rpmcache rpmdigest rpmrepo rpmspecdump \ - rpmcmp rpmdeps sqlite3 @WITH_KEYUTILS_RPMKEY@ @WITH_LIBELF_DEBUGEDIT@ + rpmcmp rpmdeps rpmdeps-oecore sqlite3 @WITH_KEYUTILS_RPMKEY@ @WITH_LIBELF_DEBUGEDIT@ - dist_man_MANS = rpmgrep.1 - - augtool_SOURCES = augtool.c -@@ -155,6 +155,10 @@ rpmdeps_SOURCES = rpmdeps.c + if WITH_DB + pkgbin_PROGRAMS += dbconvert + endif +@@ -168,6 +168,10 @@ rpmdeps_SOURCES = rpmdeps.c rpmdeps_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) rpmdeps_LDADD = $(RPM_LDADD_COMMON) @@ -40,11 +40,10 @@ index f520843..2eba9bf 100644 rpmdigest_SOURCES = rpmdigest.c rpmdigest_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) rpmdigest_LDADD = $(RPMIO_LDADD_COMMON) -diff --git a/tools/rpmdeps-oecore.c b/tools/rpmdeps-oecore.c -new file mode 100644 -index 0000000..e646da9 +Index: rpm-5.4.9/tools/rpmdeps-oecore.c +=================================================================== --- /dev/null -+++ b/tools/rpmdeps-oecore.c ++++ rpm-5.4.9/tools/rpmdeps-oecore.c @@ -0,0 +1,147 @@ +#include "system.h" +const char *__progname; @@ -193,6 +192,3 @@ index 0000000..e646da9 + optCon = rpmcliFini(optCon); + return ec; +} --- -1.7.4.1 - -- cgit v1.2.3-54-g00ecf