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, 17 insertions, 20 deletions

diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 16574e98b4..3768889e1a 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -161,7 +161,7 @@ ipk_log_check() {
 package_update_index_ipk () {
         set -x
 
-        ipkgarchs="${PACKAGE_ARCHS}"
+        ipkgarchs="${PACKAGE_ARCHS} ${SDK_PACKAGE_ARCHS}"
 
         if [ ! -z "${DEPLOY_KEEP_PACKAGES}" ]; then
                 return
@@ -169,8 +169,7 @@ package_update_index_ipk () {
 
         packagedirs="${DEPLOY_DIR_IPK}"
         for arch in $ipkgarchs; do
-                sdkarch=`echo $arch | sed -e 's/${HOST_ARCH}/${SDK_ARCH}/'`
-                packagedirs="$packagedirs ${DEPLOY_DIR_IPK}/$arch ${DEPLOY_DIR_IPK}/$sdkarch-nativesdk"
+                packagedirs="$packagedirs ${DEPLOY_DIR_IPK}/$arch"
         done
 
         multilib_archs="${MULTILIB_ARCHS}"
@@ -193,21 +192,20 @@ package_update_index_ipk () {
 #
 package_generate_ipkg_conf () {
         package_generate_archlist
-        echo "src oe file:${DEPLOY_DIR_IPK}" >> ${IPKGCONF_TARGET}
         echo "src oe file:${DEPLOY_DIR_IPK}" >> ${IPKGCONF_SDK}
+        ipkgarchs="${SDK_PACKAGE_ARCHS}"
+        for arch in $ipkgarchs; do
+                if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then
+                        echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${IPKGCONF_SDK}
+                fi
+        done
+
+        echo "src oe file:${DEPLOY_DIR_IPK}" >> ${IPKGCONF_TARGET}
         ipkgarchs="${PACKAGE_ARCHS}"
         for arch in $ipkgarchs; do
                 if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then
                         echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${IPKGCONF_TARGET}
                 fi
-                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_IPK}/$sdkarch$extension/Packages ] ; then
-                        echo "src oe-$sdkarch$extension file:${DEPLOY_DIR_IPK}/$sdkarch$extension" >> ${IPKGCONF_SDK}
-                fi
         done
 
         multilib_archs="${MULTILIB_ARCHS}"
@@ -219,16 +217,17 @@ package_generate_ipkg_conf () {
 }
 
 package_generate_archlist () {
+        ipkgarchs="${SDK_PACKAGE_ARCHS}"
+        priority=1
+        for arch in $ipkgarchs; do
+                echo "arch $arch $priority" >> ${IPKGCONF_SDK}
+                priority=$(expr $priority + 5)
+        done
+
         ipkgarchs="${PACKAGE_ARCHS}"
         priority=1
         for arch in $ipkgarchs; do
-                sdkarch=`echo $arch | sed -e 's/${HOST_ARCH}/${SDK_ARCH}/'`
                 echo "arch $arch $priority" >> ${IPKGCONF_TARGET}
-                extension=-nativesdk
-                if [ "$sdkarch" = "all" -o "$sdkarch" = "any" -o "$sdkarch" = "noarch" ]; then
-                    extension=""
-                fi
-                echo "arch $sdkarch$extension $priority" >> ${IPKGCONF_SDK}
                 priority=$(expr $priority + 5)
         done
 
@@ -237,8 +236,6 @@ package_generate_archlist () {
                 echo "arch $arch $priority" >> ${IPKGCONF_TARGET}
                 priority=$(expr $priority + 5)
         done
-
-
 }
 
 python do_package_ipk () {