From fe39685c0c59967afa4108d74086724e3b617379 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Fri, 1 Mar 2013 19:14:57 -0600 Subject: package_rpm.bbclass: Fix translate_smart_to_oe arch comparison When the OE arch is of the format "foo_bar-foobar" the previous comparison routine did not selectively translate the '-' causing a failed comparison. In order to work around this issue, we -always- compare the RPM translated version of the package architectures. (From OE-Core rev: caf798da9502c1c4967d13a4450fe02b1e7b4850) Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/classes/package_rpm.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'meta/classes/package_rpm.bbclass') diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index c0ba54dd9c..697bb365c5 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -93,7 +93,8 @@ translate_smart_to_oe() { while [ -n "$1" ]; do cmp_arch=$1 shift - if [ "$arch" = "$cmp_arch" -o "$fixed_arch" = "$cmp_arch" ]; then + fixed_cmp_arch=`echo "$cmp_arch" | tr _ -` + if [ "$fixed_arch" = "$fixed_cmp_arch" ]; then if [ "$mlib" = "default" ]; then new_pkg="$pkg" new_arch=$cmp_arch @@ -114,7 +115,7 @@ translate_smart_to_oe() { # break fi done - if [ "$found" = "1" ] && [ "$arch" = "$cmp_arch" -o "$fixed_arch" = "$cmp_arch" ]; then + if [ "$found" = "1" ] && [ "$fixed_arch" = "$fixed_cmp_arch" ]; then break fi done -- cgit v1.2.3-54-g00ecf