package_rpm.bbclass: Fix translate_smart_to_oe arch comparison
PATCH 1/1 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.
Signed-off-by Mark Hatle <[email protected]>
--- meta/classes/package_rpm.bbclass | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
meta/classes/package_rpm.bbclass +3 -2
@@ -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
Signature · 1 line
1.7.1