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

2 files changed, 25 insertions, 16 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
 
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index 6cf38d80be..08f03cd66d 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -20,6 +20,9 @@ OPKG_POSTPROCESS_COMMANDS = "ipk_insert_feed_uris"
 fakeroot rootfs_ipk_do_rootfs () {
         set -x
 
+        rm ${IPKGCONF_TARGET}
+        touch ${IPKGCONF_TARGET}
+
         ${OPKG_PREPROCESS_COMMANDS}
 
         mkdir -p ${T}/
@@ -119,19 +122,19 @@ install_all_locales() {
 
 ipk_insert_feed_uris () {
 
-        echo "Building from feeds activated!"
+        echo "Building from feeds activated!"
 
-        for line in ${IPK_FEED_URIS}
-        do
-                # strip leading and trailing spaces/tabs, then split into name and uri
-                line_clean="`echo "$line"|sed 's/^[ \t]*//;s/[ \t]*$//'`"
-                feed_name="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\1/p'`"
-                feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`"
+        for line in ${IPK_FEED_URIS}
+        do
+                # strip leading and trailing spaces/tabs, then split into name and uri
+                line_clean="`echo "$line"|sed 's/^[ \t]*//;s/[ \t]*$//'`"
+                feed_name="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\1/p'`"
+                feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`"
 
-                echo "Added $feed_name feed with URL $feed_uri"
+                echo "Added $feed_name feed with URL $feed_uri"
 
-                # insert new feed-sources
-                echo "src/gz $feed_name $feed_uri" >> ${IPKGCONF_TARGET}
+                # insert new feed-sources
+                echo "src/gz $feed_name $feed_uri" >> ${IPKGCONF_TARGET}
         done
 }
 
@@ -143,7 +146,7 @@ python () {
         flags = flags.replace("do_deploy", "")
         flags = flags.replace("do_populate_staging", "")
         bb.data.setVarFlag('do_rootfs', 'recrdeptask', flags, d)
-        bb.data.setVar('OPKG_PREPROCESS_COMMANDS', "package_generate_ipkg_conf\nipk_insert_feed_uris", d)
+        bb.data.setVar('OPKG_PREPROCESS_COMMANDS', "package_generate_archlist\nipk_insert_feed_uris", d)
         bb.data.setVar('OPKG_POSTPROCESS_COMMANDS', '', d)
 }