bitbake.conf: Add SDK_PACKAGE_ARCHS

Add SDK_PACKAGE_ARCHS to avoid the sed operations we were previously doing
inside of the variouns populate_sdk functions and related items.

Also add documentation to populate_sdk to explain when the various functions
are expected to be doing.

Finally fix a bug in populate_sdk_rpm where the wrong value was being set,
noticed while working on this change.

(From OE-Core rev: 587c1d5bac71fa6faa65ee3a271391cbf931e8f7)

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

1 files changed, 9 insertions, 14 deletions

diff --git a/meta/classes/populate_sdk_rpm.bbclass b/meta/classes/populate_sdk_rpm.bbclass
index da308c12cd..560e40c685 100644
--- a/meta/classes/populate_sdk_rpm.bbclass
+++ b/meta/classes/populate_sdk_rpm.bbclass
@@ -34,16 +34,16 @@ fakeroot populate_sdk_rpm () {
 
         #install target
         export INSTALL_ROOTFS_RPM="${SDK_OUTPUT}/${SDKTARGETSYSROOT}"
-        export INSTALL_PLATFORM_RPM="${TARGET_ARCHS}"
+        export INSTALL_PLATFORM_RPM="${TARGET_ARCH}"
         export INSTALL_CONFBASE_RPM="${RPMCONF_TARGET_BASE}"
         export INSTALL_PACKAGES_NORMAL_RPM="${TOOLCHAIN_TARGET_TASK}"
 
         # List must be prefered to least preferred order
-        INSTALL_PLATFORM_RPM=""
+        INSTALL_PLATFORM_EXTRA_RPM=""
         for each_arch in ${PACKAGE_ARCHS} ; do
-                INSTALL_PLATFORM_RPM="$each_arch $INSTALL_PLATFORM_RPM"
+                INSTALL_PLATFORM_EXTRA_RPM="$each_arch $INSTALL_PLATFORM_EXTRA_RPM"
         done
-        export INSTALL_PLATFORM_RPM
+        export INSTALL_PLATFORM_EXTRA_RPM
 
         package_install_internal_rpm
         populate_sdk_post_rpm ${INSTALL_ROOTFS_RPM}
@@ -53,16 +53,11 @@ fakeroot populate_sdk_rpm () {
         export INSTALL_PLATFORM_RPM="${SDK_ARCH}"
         export INSTALL_CONFBASE_RPM="${RPMCONF_HOST_BASE}"
         export INSTALL_PACKAGES_NORMAL_RPM="${TOOLCHAIN_HOST_TASK}"
-        export INSTALL_PLATFORM_EXTRA_RPM=""
-        for arch in ${PACKAGE_ARCHS}; do
-                sdkarch=`echo $arch | sed -e 's/${HOST_ARCH}/${SDK_ARCH}/'`
-                extension="-nativesdk"
-                if [ "$sdkarch" = "all" -o "$sdkarch" = "any" -o "$sdkarch" = "noarch" ]; then
-                    extension=""
-                fi
-                if [ -e ${DEPLOY_DIR_RPM}/$sdkarch$extension ]; then
-                        INSTALL_PLATFORM_EXTRA_RPM="$sdkarch $INSTALL_PLATFORM_EXTRA_RPM"
-                fi
+
+        # List must be prefered to least preferred order
+        INSTALL_PLATFORM_EXTRA_RPM=""
+        for each_arch in ${SDK_PACKAGE_ARCHS} ; do
+                INSTALL_PLATFORM_EXTRA_RPM="$each_arch $INSTALL_PLATFORM_EXTRA_RPM"
         done
         export INSTALL_PLATFORM_EXTRA_RPM