diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2011-08-10 11:13:33 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-12 17:21:54 +0100 |
commit | 93084574046b2b64826bd5ebde55a0504f3b9283 (patch) | |
tree | 523ff2167f66b670746930e855281d91e9fe35c2 /meta/recipes-devtools/rpm/rpm_5.4.0.bb | |
parent | 8bc2ebf59a82de568b6543246d6e5aa9769a03d5 (diff) | |
download | poky-93084574046b2b64826bd5ebde55a0504f3b9283.tar.gz |
rpm: Fix the canonical arch --target processing and cleanup
[YOCTO #1352]
Fix the canonical arch --target processor to work with the way OE
handles the GNU canonical arch.
Also cleanup a number of files that are no longer used, and refactor
the no-loop patch into the "no-loopmsg" patch.
(From OE-Core rev: 25904ad2bdeadda9189805bb7a210eafe5795024)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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, 3 insertions, 5 deletions
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb index c0e3208383..0882df787f 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb | |||
@@ -45,7 +45,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" | |||
45 | DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}" | 45 | DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}" |
46 | extrarpmdeps = "python perl" | 46 | extrarpmdeps = "python perl" |
47 | extrarpmdeps_virtclass-native = "" | 47 | extrarpmdeps_virtclass-native = "" |
48 | PR = "r19" | 48 | PR = "r20" |
49 | 49 | ||
50 | # rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed | 50 | # rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed |
51 | # in order to extract the distribution SRPM into a format we can extract... | 51 | # in order to extract the distribution SRPM into a format we can extract... |
@@ -61,14 +61,12 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.0-0.20101229.src.rpm;ex | |||
61 | file://rpm-tools-mtree-LDFLAGS.patch \ | 61 | file://rpm-tools-mtree-LDFLAGS.patch \ |
62 | file://fprint-pointer-fix.patch \ | 62 | file://fprint-pointer-fix.patch \ |
63 | file://rpm-fileclass.patch \ | 63 | file://rpm-fileclass.patch \ |
64 | file://rpm-canonarch.patch \ | ||
65 | file://rpm-no-loopmsg.patch \ | ||
64 | " | 66 | " |
65 | 67 | ||
66 | # file://hdraddorappend.patch \ | ||
67 | # file://export-rpmbag-h.patch \ | ||
68 | # file://rpm-nrescan.patch \ | ||
69 | # file://rpm-autoconf.patch \ | 68 | # file://rpm-autoconf.patch \ |
70 | # file://remove-compiled-tests.patch;apply=no \ | 69 | # file://remove-compiled-tests.patch;apply=no \ |
71 | # file://rpm-no-loop.patch \ | ||
72 | # " | 70 | # " |
73 | 71 | ||
74 | SRC_URI[md5sum] = "19c1a7f68d7765eeb7615c9c4e54e380" | 72 | SRC_URI[md5sum] = "19c1a7f68d7765eeb7615c9c4e54e380" |