mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-11 04:19:50 +00:00
Code Issues Projects Releases Wiki Activity

package_rpm.bbclass: Fix translate_smart_to_oe arch comparison

Browse Source 
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>
This commit is contained in:
Mark Hatle
2013-03-01 19:14:57 -06:00
committed by Richard Purdie
parent 2997653fe3
commit fe39685c0c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/package_rpm.bbclass
+3 -2
View File
@@ -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