From 93084574046b2b64826bd5ebde55a0504f3b9283 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 10 Aug 2011 11:13:33 -0500 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch (limited to 'meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch') diff --git a/meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch b/meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch new file mode 100644 index 0000000000..4aded7518e --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch @@ -0,0 +1,16 @@ +lib/order.c: Make the dependency loop messages into debug msgs + +Signed-off-by: Mark Hatle + +diff -urN rpm-5.4.0.orig/lib/order.c rpm-5.4.0/lib/order.c +--- rpm-5.4.0.orig/lib/order.c 2010-12-13 17:36:39.000000000 -0600 ++++ rpm-5.4.0/lib/order.c 2011-08-10 11:11:43.194686332 -0500 +@@ -2170,7 +2170,7 @@ + const char * dp; + rpmlogLvl msglvl = (anaconda || (rpmtsDFlags(ts) & RPMDEPS_FLAG_DEPLOOPS)) + ? RPMLOG_WARNING : RPMLOG_ERR; +-#if defined(RPM_VENDOR_MANDRIVA) /* loop-detection-optional-loglevel */ ++#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_POKY) /* loop-detection-optional-loglevel */ + // Report loops as debug-level message by default (7 = RPMLOG_DEBUG), overridable + msglvl = rpmExpandNumeric("%{?_loop_detection_loglevel}%{?!_loop_detection_loglevel:7}"); + #endif -- cgit v1.2.3-54-g00ecf