rootfs_rpm.bbclass: Reorder feed priority based on multilib image setting

[ YOCTO #3915 ]
[ CQID: WIND00404309 ]

When doing a multilib image build, such as bitbake lib32-core-image-sato, the
system needs to reorder the priority level of the feeds.  If it does not
reorder the priorities, then 64-bit items can be selected by the automatic
dependency resolution in Smart.

(From OE-Core rev: dfbb1aa184955923b85b81aabf944de8f1a1e4b5)

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>

2 files changed, 21 insertions, 3 deletions

diff --git a/meta/classes/populate_sdk_rpm.bbclass b/meta/classes/populate_sdk_rpm.bbclass
index 00a3ab477e..0595aa7fca 100644
--- a/meta/classes/populate_sdk_rpm.bbclass
+++ b/meta/classes/populate_sdk_rpm.bbclass
@@ -55,18 +55,27 @@ populate_sdk_rpm () {
         mkdir -p ${INSTALL_ROOTFS_RPM}/etc/rpm/
 
         # List must be prefered to least preferred order
+        default_extra_rpm=""
         INSTALL_PLATFORM_EXTRA_RPM=""
         for i in ${MULTILIB_PREFIX_LIST} ; do
                 old_IFS="$IFS"
                 IFS=":"
                 set $i
                 IFS="$old_IFS"
+                mlib=$1
                 shift #remove mlib
                 while [ -n "$1" ]; do
-                        INSTALL_PLATFORM_EXTRA_RPM="$INSTALL_PLATFORM_EXTRA_RPM $1"
+                        if [ "$mlib" = "${BBEXTENDVARIANT}" ]; then
+                                default_extra_rpm="$default_extra_rpm $1"
+                        else
+                                INSTALL_PLATFORM_EXTRA_RPM="$INSTALL_PLATFORM_EXTRA_RPM $1"
+                        fi
                         shift
                 done
         done
+        if [ -n "$default_extra_rpm" ]; then
+                INSTALL_PLATFORM_EXTRA_RPM="$default_extra_rpm $INSTALL_PLATFORM_EXTRA_RPM"
+        fi
         export INSTALL_PLATFORM_EXTRA_RPM
 
         package_install_internal_rpm
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index 5651243090..920380e559 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -62,18 +62,27 @@ fakeroot rootfs_rpm_do_rootfs () {
         mkdir -p ${INSTALL_ROOTFS_RPM}/etc/rpm/
 
         # List must be prefered to least preferred order
+        default_extra_rpm=""
         INSTALL_PLATFORM_EXTRA_RPM=""
         for i in ${MULTILIB_PREFIX_LIST} ; do
                 old_IFS="$IFS"
                 IFS=":"
                 set $i
                 IFS="$old_IFS"
+                mlib=$1
                 shift #remove mlib
-                while [ -n "$1" ]; do  
-                        INSTALL_PLATFORM_EXTRA_RPM="$INSTALL_PLATFORM_EXTRA_RPM $1"
+                while [ -n "$1" ]; do
+                        if [ "$mlib" = "${BBEXTENDVARIANT}" ]; then
+                                default_extra_rpm="$default_extra_rpm $1"
+                        else
+                                INSTALL_PLATFORM_EXTRA_RPM="$INSTALL_PLATFORM_EXTRA_RPM $1"
+                        fi
                         shift
                 done
         done
+        if [ -n "$default_extra_rpm" ]; then
+                INSTALL_PLATFORM_EXTRA_RPM="$default_extra_rpm $INSTALL_PLATFORM_EXTRA_RPM"
+        fi
         export INSTALL_PLATFORM_EXTRA_RPM
 
         package_install_internal_rpm