diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2012-06-11 13:18:53 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-12 11:10:35 +0100 |
commit | bc4a29df84542f0ef905a2e20d8533a0ea7cb613 (patch) | |
tree | d0261f05a3ec020eb2c46dd36d22d1ee19be2a82 /meta/recipes-extended/libzypp/libzypp_git.bb | |
parent | b2381b63b94604fdc0e1a7591c854dc1df3ca8f4 (diff) | |
download | poky-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/libzypp_git.bb')
-rw-r--r-- | meta/recipes-extended/libzypp/libzypp_git.bb | 3 |
1 files changed, 2 insertions, 1 deletions
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" | |||
11 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
12 | SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433" | 12 | SRCREV = "15b6c52260bbc52b3d8e585e271b67e10cc7c433" |
13 | PV = "0.0-git${SRCPV}" | 13 | PV = "0.0-git${SRCPV}" |
14 | PR = "r20" | 14 | PR = "r21" |
15 | 15 | ||
16 | SRC_URI = "git://github.com/openSUSE/libzypp.git;protocol=git \ | 16 | SRC_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 | ||
28 | SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch" | 29 | SRC_URI_append_mips = " file://mips-workaround-gcc-tribool-error.patch" |