summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2014-02-05 11:08:34 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-11 11:53:44 +0000
commitf4fa44cf914dc504709eb8c302566429071f2b80 (patch)
tree13462d94fe54df0f8d5d97075626fcdfd6b6bbb5 /meta/classes
parentab8cbf35d6d9906e72ebc25d18f19a1f3dc82fd9 (diff)
downloadpoky-f4fa44cf914dc504709eb8c302566429071f2b80.tar.gz
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; (From OE-Core rev: 19c538f57c8fa7c566e88a6dbe13ea4826d4f26c) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/rootfs_ipk.bbclass31
1 files changed, 1 insertions, 30 deletions
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"
23 23
24MULTILIBRE_ALLOW_REP = "${OPKGLIBDIR}/opkg" 24MULTILIBRE_ALLOW_REP = "${OPKGLIBDIR}/opkg"
25 25
26ipk_insert_feed_uris () {
27
28 echo "Building from feeds activated!"
29
30 for line in ${IPK_FEED_URIS}
31 do
32 # strip leading and trailing spaces/tabs, then split into name and uri
33 line_clean="`echo "$line"|sed 's/^[ \t]*//;s/[ \t]*$//'`"
34 feed_name="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\1/p'`"
35 feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`"
36
37 echo "Added $feed_name feed with URL $feed_uri"
38
39 # insert new feed-sources
40 echo "src/gz $feed_name $feed_uri" >> ${IPKGCONF_TARGET}
41 done
42
43 # Allow to use package deploy directory contents as quick devel-testing
44 # feed. This creates individual feed configs for each arch subdir of those
45 # specified as compatible for the current machine.
46 # NOTE: Development-helper feature, NOT a full-fledged feed.
47 if [ -n "${FEED_DEPLOYDIR_BASE_URI}" ]; then
48 for arch in ${PACKAGE_ARCHS}
49 do
50 echo "src/gz local-$arch ${FEED_DEPLOYDIR_BASE_URI}/$arch" >> ${IMAGE_ROOTFS}/etc/opkg/local-$arch-feed.conf
51 done
52 fi
53}
54
55python () { 26python () {
56 27
57 if d.getVar('BUILD_IMAGES_FROM_FEEDS', True): 28 if d.getVar('BUILD_IMAGES_FROM_FEEDS', True):
@@ -60,7 +31,7 @@ python () {
60 flags = flags.replace("do_deploy", "") 31 flags = flags.replace("do_deploy", "")
61 flags = flags.replace("do_populate_sysroot", "") 32 flags = flags.replace("do_populate_sysroot", "")
62 d.setVarFlag('do_rootfs', 'recrdeptask', flags) 33 d.setVarFlag('do_rootfs', 'recrdeptask', flags)
63 d.setVar('OPKG_PREPROCESS_COMMANDS', "ipk_insert_feed_uris") 34 d.setVar('OPKG_PREPROCESS_COMMANDS', "")
64 d.setVar('OPKG_POSTPROCESS_COMMANDS', '') 35 d.setVar('OPKG_POSTPROCESS_COMMANDS', '')
65} 36}
66 37