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>

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"
 DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}"
 extrarpmdeps = "python perl"
 extrarpmdeps_virtclass-native = ""
-PR = "r19"
+PR = "r20"
 
 # rpm2cpio is a shell script, which is part of the rpm src.rpm.  It is needed
 # 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
            file://rpm-tools-mtree-LDFLAGS.patch \
            file://fprint-pointer-fix.patch \
            file://rpm-fileclass.patch \
+           file://rpm-canonarch.patch \
+           file://rpm-no-loopmsg.patch \
           "
 
-#           file://hdraddorappend.patch \
-#           file://export-rpmbag-h.patch \
-#          file://rpm-nrescan.patch \
 #          file://rpm-autoconf.patch \
 #          file://remove-compiled-tests.patch;apply=no \
-#          file://rpm-no-loop.patch \
 #         "
 
 SRC_URI[md5sum] = "19c1a7f68d7765eeb7615c9c4e54e380"