diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2011-02-15 22:20:49 -0600 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2011-02-16 07:34:51 -0800 |
commit | ca649ef8253cbf69062322b5bdee4123ee4c4eca (patch) | |
tree | e6006e59ece4109391ddd09ad683bc28821cce5d /meta/recipes-devtools/rpm/rpm_5.4.0.bb | |
parent | 0e4aa13e9eef50533d8385b7fa638f33d4248e78 (diff) | |
download | poky-ca649ef8253cbf69062322b5bdee4123ee4c4eca.tar.gz |
rpm: Add the ability to use the platform file during install
Add a new rpm macro, rpmrc_platform_path to specify an alternative platform
file. This is required to allow the dep resolver to identify compatible
packages.
Also workaround a minor problem with the --showrc command in RPM. A bug
has been reported upstream on this.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm_5.4.0.bb')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4.0.bb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb index 56fcd9c62f..93951d2c61 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb | |||
@@ -43,7 +43,7 @@ LICENSE = "LGPL 2.1" | |||
43 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" | 43 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" |
44 | 44 | ||
45 | DEPENDS = "bzip2 zlib python perl db openssl elfutils expat libpcre attr acl popt" | 45 | DEPENDS = "bzip2 zlib python perl db openssl elfutils expat libpcre attr acl popt" |
46 | PR = "r11" | 46 | PR = "r12" |
47 | 47 | ||
48 | # rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed | 48 | # rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed |
49 | # in order to extract the distribution SRPM into a format we can extract... | 49 | # in order to extract the distribution SRPM into a format we can extract... |
@@ -51,7 +51,9 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.0-0.20101229.src.rpm;ex | |||
51 | file://perfile_rpmdeps.sh \ | 51 | file://perfile_rpmdeps.sh \ |
52 | file://rpm-autogen.patch \ | 52 | file://rpm-autogen.patch \ |
53 | file://rpm-libsql-fix.patch \ | 53 | file://rpm-libsql-fix.patch \ |
54 | file://header-include-fix.patch \ | 54 | file://header-include-fix.patch \ |
55 | file://rpm-platform.patch \ | ||
56 | file://rpm-showrc.patch \ | ||
55 | " | 57 | " |
56 | 58 | ||
57 | # file://hdraddorappend.patch \ | 59 | # file://hdraddorappend.patch \ |
@@ -155,7 +157,7 @@ EXTRA_OECONF = "--verbose \ | |||
155 | --with-path-macros=${rpm_macros} \ | 157 | --with-path-macros=${rpm_macros} \ |
156 | --with-bugreport=http://bugzilla.pokylinux.org" | 158 | --with-bugreport=http://bugzilla.pokylinux.org" |
157 | 159 | ||
158 | CFLAGS_append = " -DRPM_VENDOR_WINDRIVER" | 160 | CFLAGS_append = " -DRPM_VENDOR_WINDRIVER -DRPM_VENDOR_POKY" |
159 | 161 | ||
160 | PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-libs ${PN}-dev ${PN}-common ${PN}-build python-rpm-dbg python-rpm perl-module-rpm perl-module-rpm-dev ${PN}-locale" | 162 | PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-libs ${PN}-dev ${PN}-common ${PN}-build python-rpm-dbg python-rpm perl-module-rpm perl-module-rpm-dev ${PN}-locale" |
161 | 163 | ||