1 files changed, 28 insertions, 14 deletions

diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 9ef1acd475..4605ec8a1e 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -166,7 +166,7 @@ package_install_internal_rpm () {
         local platform="${INSTALL_PLATFORM_RPM}"
         local platform_extra="${INSTALL_PLATFORM_EXTRA_RPM}"
         local confbase="${INSTALL_CONFBASE_RPM}"
-        local package_to_install="${INSTALL_PACKAGES_NORMAL_RPM}"
+        local package_to_install="${INSTALL_PACKAGES_NORMAL_RPM} ${INSTALL_PACKAGES_MULTILIB_RPM}"
         local package_attemptonly="${INSTALL_PACKAGES_ATTEMPTONLY_RPM}"
         local package_linguas="${INSTALL_PACKAGES_LINGUAS_RPM}"
         local providename="${INSTALL_PROVIDENAME_RPM}"
@@ -210,10 +210,15 @@ package_install_internal_rpm () {
                                 echo "Processing $pkg..."
 
                                 archvar=base_archs
-                                ml_pkg=$(echo ${pkg} | sed "s,^${MLPREFIX}\(.*\),\1,")
-                                if [ "${ml_pkg}" != "${pkg}" ]; then
-                                        archvar=ml_archs
-                                fi
+                                ml_prefix=`echo ${pkg} | cut -d'-' -f1`
+                                ml_pkg=$pkg
+                                for i in ${MULTILIB_PREFIX_LIST} ; do
+                                        if [ ${ml_prefix} == ${i} ]; then
+                                                ml_pkg=$(echo ${pkg} | sed "s,^${ml_prefix}-\(.*\),\1,")
+                                                archvar=ml_archs
+                                                break
+                                        fi
+                                done
 
                                 pkg_name=$(resolve_package_rpm ${confbase}-${archvar}.conf ${ml_pkg})
                                 if [ -z "$pkg_name" ]; then
@@ -224,16 +229,20 @@ package_install_internal_rpm () {
                         done
                 fi
         fi
-
         if [ ! -z "${package_to_install}" ]; then
                 for pkg in ${package_to_install} ; do
                         echo "Processing $pkg..."
 
                         archvar=base_archs
-                        ml_pkg=$(echo ${pkg} | sed "s,^${MLPREFIX}\(.*\),\1,")
-                        if [ "${ml_pkg}" != "${pkg}" ]; then
-                                archvar=ml_archs
-                        fi
+                        ml_prefix=`echo ${pkg} | cut -d'-' -f1`
+                        ml_pkg=$pkg
+                        for i in ${MULTILIB_PREFIX_LIST} ; do
+                                if [ ${ml_prefix} == ${i} ]; then
+                                        ml_pkg=$(echo ${pkg} | sed "s,^${ml_prefix}-\(.*\),\1,")
+                                        archvar=ml_archs
+                                        break
+                                fi
+                        done
 
                         pkg_name=$(resolve_package_rpm ${confbase}-${archvar}.conf ${ml_pkg})
                         if [ -z "$pkg_name" ]; then
@@ -258,10 +267,15 @@ package_install_internal_rpm () {
                 for pkg in ${package_attemptonly} ; do
                         echo "Processing $pkg..."
                         archvar=base_archs
-                        ml_pkg=$(echo ${pkg} | sed "s,^${MLPREFIX}\(.*\),\1,")
-                        if [ "${ml_pkg}" != "${pkg}" ]; then
-                                archvar=ml_archs
-                        fi
+                        ml_prefix=`echo ${pkg} | cut -d'-' -f1`
+                        ml_pkg=$pkg
+                        for i in ${MULTILIB_PREFIX_LIST} ; do
+                                if [ ${ml_prefix} == ${i} ]; then
+                                        ml_pkg=$(echo ${pkg} | sed "s,^${ml_prefix}-\(.*\),\1,")
+                                        archvar=ml_archs
+                                        break
+                                fi
+                        done
 
                         pkg_name=$(resolve_package_rpm ${confbase}-${archvar}.conf ${ml_pkg})
                         if [ -z "$pkg_name" ]; then