diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2012-12-03 17:58:29 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-06 12:31:04 +0000 |
commit | f47fa1a8c0e76ca1b72091fefa8e59af09f5c501 (patch) | |
tree | 97e84c9bc5a2542d9e908357c060ad04809d8d49 /meta/recipes-devtools/rpm/rpm_5.4.9.bb | |
parent | f8b2ec3c9468d29e0d3ac010c1d05d275d53123c (diff) | |
download | poky-f47fa1a8c0e76ca1b72091fefa8e59af09f5c501.tar.gz |
rpm: Fixup platform matching code
On ARM systems the platform matching code could fail in some cases, as
the system macros file could override the 'platform' file settings.
(From OE-Core rev: e5f557b3bdaa5bbd632b50824d8f85d2d2aeb221)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm_5.4.9.bb')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4.9.bb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb index 59f3eef276..7311d0e015 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb | |||
@@ -43,7 +43,7 @@ LICENSE = "LGPLv2.1" | |||
43 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" | 43 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" |
44 | 44 | ||
45 | DEPENDS = "libpcre attr acl popt ossp-uuid file bison-native" | 45 | DEPENDS = "libpcre attr acl popt ossp-uuid file bison-native" |
46 | PR = "r57" | 46 | PR = "r58" |
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... |
@@ -83,6 +83,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.9-0.20120508.src.rpm;ex | |||
83 | file://rpm-py-init.patch \ | 83 | file://rpm-py-init.patch \ |
84 | file://python-rpm-rpmsense.patch \ | 84 | file://python-rpm-rpmsense.patch \ |
85 | file://rpm-reloc-macros.patch \ | 85 | file://rpm-reloc-macros.patch \ |
86 | file://rpm-platform2.patch \ | ||
86 | " | 87 | " |
87 | 88 | ||
88 | SRC_URI[md5sum] = "60d56ace884340c1b3fcac6a1d58e768" | 89 | SRC_URI[md5sum] = "60d56ace884340c1b3fcac6a1d58e768" |