diff options
| author | Mark Hatle <mark.hatle@windriver.com> | 2013-03-01 19:14:57 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-02 12:59:00 +0000 |
| commit | caf798da9502c1c4967d13a4450fe02b1e7b4850 (patch) | |
| tree | d2d41fa3152b443c970f32f716e8874fda756327 | |
| parent | fa6b65e1f6192baa284ab5549ba00df0bbedf53b (diff) | |
| download | openembedded-core-caf798da9502c1c4967d13a4450fe02b1e7b4850.tar.gz openembedded-core-caf798da9502c1c4967d13a4450fe02b1e7b4850.tar.bz2 openembedded-core-caf798da9502c1c4967d13a4450fe02b1e7b4850.zip | |
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 <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/package_rpm.bbclass | 5 |
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() { 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 |