summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/libzypp
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-06-11 13:18:53 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-12 11:10:35 +0100
commitbc4a29df84542f0ef905a2e20d8533a0ea7cb613 (patch)
treed0261f05a3ec020eb2c46dd36d22d1ee19be2a82 /meta/recipes-extended/libzypp
parentb2381b63b94604fdc0e1a7591c854dc1df3ca8f4 (diff)
downloadpoky-bc4a29df84542f0ef905a2e20d8533a0ea7cb613.tar.gz
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 <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/libzypp')
-rw-r--r--meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch28
-rw-r--r--meta/recipes-extended/libzypp/libzypp_git.bb3
2 files changed, 30 insertions, 1 deletions
diff --git a/meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch b/meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch
new file mode 100644
index 0000000000..8268a2d51d
--- /dev/null
+++ b/meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch
@@ -0,0 +1,28 @@
1commit 6c47ad415246cc3a3edac2e1637106d330574c85
2Author: Mark Hatle <mark.hatle@windriver.com>
3Date: Fri May 11 19:05:09 2012 -0500
4
5 RpmHeader.cc: RPM 5.4.9 integration
6
7 _RPMVSF_xxx - NODIGEST, NOSIGNATURES, NOHEADER, and NOPAYLOAD
8 are now obsolete and no longer supported.
9
10 Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
11
12diff --git a/zypp/target/rpm/RpmHeader.cc b/zypp/target/rpm/RpmHeader.cc
13index 1224ecd..c96dae6 100644
14--- a/zypp/target/rpm/RpmHeader.cc
15+++ b/zypp/target/rpm/RpmHeader.cc
16@@ -230,10 +230,12 @@ RpmHeader::constPtr RpmHeader::readPackage( const Pathname & path_r,
17 librpmDb::globalInit();
18 rpmts ts = ::rpmtsCreate();
19 unsigned vsflag = RPMVSF_DEFAULT;
20+#if !defined(_RPM_5)
21 if ( verification_r & NODIGEST )
22 vsflag |= _RPMVSF_NODIGESTS;
23 if ( verification_r & NOSIGNATURE )
24 vsflag |= _RPMVSF_NOSIGNATURES;
25+#endif
26 ::rpmtsSetVSFlags( ts, rpmVSFlags(vsflag) );
27
28 Header nh = 0;
diff --git a/meta/recipes-extended/libzypp/libzypp_git.bb b/meta/recipes-extended/libzypp/libzypp_git.bb
index 3c3a9f09ec..c5761d5784 100644
--- a/meta/recipes-extended/libzypp/libzypp_git.bb
+++ b/meta/recipes-extended/libzypp/libzypp_git.bb
@@ -11,7 +11,7 @@ DEPENDS = "rpm boost curl libxml2 zlib sat-solver expat openssl udev libproxy"
11S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
12SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433" 12SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433"
13PV = "0.0-git${SRCPV}" 13PV = "0.0-git${SRCPV}"
14PR = "r20" 14PR = "r21"
15 15
16SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \ 16SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \
17 file://no-doc.patch \ 17 file://no-doc.patch \
@@ -23,6 +23,7 @@ SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \
23 file://fix_for_compile_wth_gcc-4.6.0.patch \ 23 file://fix_for_compile_wth_gcc-4.6.0.patch \
24 file://hardcode-lib-fix.patch \ 24 file://hardcode-lib-fix.patch \
25 file://close.patch \ 25 file://close.patch \
26 file://libzypp-rpm549.patch \
26 " 27 "
27 28
28SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch" 29SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch"