diff options
Diffstat (limited to 'meta/classes/package_rpm.bbclass')
| -rw-r--r-- | meta/classes/package_rpm.bbclass | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index a00b70205c..05108b26f1 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass | |||
| @@ -99,8 +99,11 @@ translate_smart_to_oe() { | |||
| 99 | if [ "$arch" = "$cmp_arch" -o "$fixed_arch" = "$cmp_arch" ]; then | 99 | if [ "$arch" = "$cmp_arch" -o "$fixed_arch" = "$cmp_arch" ]; then |
| 100 | if [ "$mlib" = "default" ]; then | 100 | if [ "$mlib" = "default" ]; then |
| 101 | new_pkg="$pkg" | 101 | new_pkg="$pkg" |
| 102 | new_arch=$cmp_arch | ||
| 102 | else | 103 | else |
| 103 | new_pkg="$mlib-$pkg" | 104 | new_pkg="$mlib-$pkg" |
| 105 | # We need to strip off the ${mlib}_ prefix on the arch | ||
| 106 | new_arch=${cmp_arch#${mlib}_} | ||
| 104 | fi | 107 | fi |
| 105 | # Workaround for bug 3565 | 108 | # Workaround for bug 3565 |
| 106 | # Simply look to see if we know of a package with that name, if not try again! | 109 | # Simply look to see if we know of a package with that name, if not try again! |
| @@ -121,7 +124,7 @@ translate_smart_to_oe() { | |||
| 121 | 124 | ||
| 122 | #echo "$pkg -> $new_pkg" >&2 | 125 | #echo "$pkg -> $new_pkg" >&2 |
| 123 | if [ "$arg1" = "arch" ]; then | 126 | if [ "$arg1" = "arch" ]; then |
| 124 | echo $new_pkg $cmp_arch $other | 127 | echo $new_pkg $new_arch $other |
| 125 | else | 128 | else |
| 126 | echo $new_pkg $other | 129 | echo $new_pkg $other |
| 127 | fi | 130 | fi |