summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2013-03-01 19:14:57 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-02 12:59:05 +0000
commitfe39685c0c59967afa4108d74086724e3b617379 (patch)
tree5dcd8de82bbfb45b770db4ee880d6d9227efb5aa
parent2997653fe373f1b9a938367a2e001dfed7f445f0 (diff)
downloadpoky-fe39685c0c59967afa4108d74086724e3b617379.tar.gz
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 <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/package_rpm.bbclass5
1 files changed, 3 insertions, 2 deletions
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() {
93 while [ -n "$1" ]; do 93 while [ -n "$1" ]; do
94 cmp_arch=$1 94 cmp_arch=$1
95 shift 95 shift
96 if [ "$arch" = "$cmp_arch" -o "$fixed_arch" = "$cmp_arch" ]; then 96 fixed_cmp_arch=`echo "$cmp_arch" | tr _ -`
97 if [ "$fixed_arch" = "$fixed_cmp_arch" ]; then
97 if [ "$mlib" = "default" ]; then 98 if [ "$mlib" = "default" ]; then
98 new_pkg="$pkg" 99 new_pkg="$pkg"
99 new_arch=$cmp_arch 100 new_arch=$cmp_arch
@@ -114,7 +115,7 @@ translate_smart_to_oe() {
114 # break 115 # break
115 fi 116 fi
116 done 117 done
117 if [ "$found" = "1" ] && [ "$arch" = "$cmp_arch" -o "$fixed_arch" = "$cmp_arch" ]; then 118 if [ "$found" = "1" ] && [ "$fixed_arch" = "$fixed_cmp_arch" ]; then
118 break 119 break
119 fi 120 fi
120 done 121 done