From 19c538f57c8fa7c566e88a6dbe13ea4826d4f26c Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Wed, 5 Feb 2014 11:08:34 +0200 Subject: rootfs.py, package_manager.py, sdk.py: Fix building from feeds feature for opkg When using opkg as the PM backend, one has the option to provide custom feeds to create the rootfs from. This commit: * fixes this in the refactored code; * moves the custom config creation code to python; * clean up the package-ipk.bbclass; Signed-off-by: Laurentiu Palcu --- meta/classes/rootfs_ipk.bbclass | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) (limited to 'meta/classes/rootfs_ipk.bbclass') diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass index 9d63450dd1..6d4f9facc0 100644 --- a/meta/classes/rootfs_ipk.bbclass +++ b/meta/classes/rootfs_ipk.bbclass @@ -23,35 +23,6 @@ OPKGLIBDIR = "${localstatedir}/lib" MULTILIBRE_ALLOW_REP = "${OPKGLIBDIR}/opkg" -ipk_insert_feed_uris () { - - 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'`" - - echo "Added $feed_name feed with URL $feed_uri" - - # insert new feed-sources - echo "src/gz $feed_name $feed_uri" >> ${IPKGCONF_TARGET} - done - - # Allow to use package deploy directory contents as quick devel-testing - # feed. This creates individual feed configs for each arch subdir of those - # specified as compatible for the current machine. - # NOTE: Development-helper feature, NOT a full-fledged feed. - if [ -n "${FEED_DEPLOYDIR_BASE_URI}" ]; then - for arch in ${PACKAGE_ARCHS} - do - echo "src/gz local-$arch ${FEED_DEPLOYDIR_BASE_URI}/$arch" >> ${IMAGE_ROOTFS}/etc/opkg/local-$arch-feed.conf - done - fi -} - python () { if d.getVar('BUILD_IMAGES_FROM_FEEDS', True): @@ -60,7 +31,7 @@ python () { flags = flags.replace("do_deploy", "") flags = flags.replace("do_populate_sysroot", "") d.setVarFlag('do_rootfs', 'recrdeptask', flags) - d.setVar('OPKG_PREPROCESS_COMMANDS', "ipk_insert_feed_uris") + d.setVar('OPKG_PREPROCESS_COMMANDS', "") d.setVar('OPKG_POSTPROCESS_COMMANDS', '') } -- cgit 1.2.3-korg