diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-10-08 16:49:57 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-10-08 16:49:57 +0000 |
| commit | fb439d9bc05a1cbe9f5752d7f52494e6c8de8efb (patch) | |
| tree | c711d38899778937c30f11c87498f43447e6acbd /meta/classes/rootfs_ipk.bbclass | |
| parent | 3dc1ade034ee427f87a8b6691ed3492e2a2f72e4 (diff) | |
| download | openembedded-core-fb439d9bc05a1cbe9f5752d7f52494e6c8de8efb.tar.gz openembedded-core-fb439d9bc05a1cbe9f5752d7f52494e6c8de8efb.tar.bz2 openembedded-core-fb439d9bc05a1cbe9f5752d7f52494e6c8de8efb.zip | |
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
Diffstat (limited to 'meta/classes/rootfs_ipk.bbclass')
| -rw-r--r-- | meta/classes/rootfs_ipk.bbclass | 25 |
1 files changed, 14 insertions, 11 deletions
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) } |