classes/image: handle multilibs in complementary package lookup

For multilib the vendor string is altered, so we need to iterate over
all of the multilib vendors when we do the glob processing for
complementary packages.

(From OE-Core rev: ff01518c6667e1b6e87df4e5a435a701d0f38fa7)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>

In addition, the RPM package arch have been munged by adding the multilib
identifier.  This identifier needs to be stripped when generating the
installed_packages list for the complementary lookup code to work.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

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() {
                                 if [ "$arch" = "$cmp_arch" -o "$fixed_arch" = "$cmp_arch" ]; then
                                         if [ "$mlib" = "default" ]; then
                                                 new_pkg="$pkg"
+                                                new_arch=$cmp_arch
                                         else
                                                 new_pkg="$mlib-$pkg"
+                                                # We need to strip off the ${mlib}_ prefix on the arch
+                                                new_arch=${cmp_arch#${mlib}_}
                                         fi
                                         # Workaround for bug 3565
                                         # 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() {
 
                 #echo "$pkg -> $new_pkg" >&2
                 if [ "$arg1" = "arch" ]; then
-                        echo $new_pkg $cmp_arch $other
+                        echo $new_pkg $new_arch $other
                 else
                         echo $new_pkg $other
                 fi