package_ipk.bbclass: Tweak handling for all/any/noarch and nativesdk

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 56a1e73ecc5e806f712d757d11457aef9c26a8ac..04b117b75d22591e7d2b66a0f91f7a54254cea61 100644 (file)
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -122,7 +122,11 @@ package_generate_archlist () {
        for arch in $ipkgarchs; do
                sdkarch=`echo $arch | sed -e 's/${HOST_ARCH}/${SDK_ARCH}/'`
                echo "arch $arch $priority" >> ${IPKGCONF_TARGET}
-               echo "arch $sdkarch-nativesdk $priority" >> ${IPKGCONF_SDK}
+               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
        echo "arch ${SDK_ARCH}-${TARGET_ARCH}-canadian $priority" >> ${IPKGCONF_SDK}