package_ipk/rootfs_ipk.bbclass: Update image from feed handling

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5465 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 11 insertions, 5 deletions

diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index b4308d55a6..d99150ec56 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -94,15 +94,11 @@ package_update_index_ipk () {
 # use against the host system in sdk builds
 #
 package_generate_ipkg_conf () {
-        mkdir -p ${STAGING_ETCDIR_NATIVE}/
+        package_generate_archlist
         echo "src oe file:${DEPLOY_DIR_IPK}" > ${IPKGCONF_TARGET}
         echo "src oe file:${DEPLOY_DIR_IPK}" > ${IPKGCONF_SDK}
         ipkgarchs="${PACKAGE_ARCHS}"
-        priority=1
         for arch in $ipkgarchs; do
-                echo "arch $arch $priority" >> ${IPKGCONF_TARGET}
-                echo "arch ${BUILD_ARCH}-$arch-sdk $priority" >> ${IPKGCONF_SDK}
-                priority=$(expr $priority + 5)
                 if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then
                         echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${IPKGCONF_TARGET}
                 fi
@@ -112,6 +108,16 @@ package_generate_ipkg_conf () {
         done
 }
 
+package_generate_archlist () {
+        ipkgarchs="${PACKAGE_ARCHS}"
+        priority=1
+        for arch in $ipkgarchs; do
+                echo "arch $arch $priority" >> ${IPKGCONF_TARGET}
+                echo "arch ${BUILD_ARCH}-$arch-sdk $priority" >> ${IPKGCONF_SDK}
+                priority=$(expr $priority + 5)
+        done
+}
+
 python do_package_ipk () {
         import sys, re, copy