summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-10-01 15:52:19 +0000
committerRichard Purdie <richard@openedhand.com>2008-10-01 15:52:19 +0000
commitbeee0c51f2b4aa5e40b82a9f2f203f9809196dae (patch)
tree4ec92d865d5e6ee6fa828978cd1a8c458fd5e1ba /meta/classes
parent39b0cfa2bd4ed016d4fd49de7d26a61d8ebb84f8 (diff)
downloadpoky-beee0c51f2b4aa5e40b82a9f2f203f9809196dae.tar.gz
rootfs_ipk.bbclass: Improve image from feed generation
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5374 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/rootfs_ipk.bbclass18
1 files changed, 12 insertions, 6 deletions
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index 2f1290ee59..9663d7aa70 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -13,14 +13,19 @@ do_rootfs[recrdeptask] += "do_package_write_ipk"
13 13
14IPKG_ARGS = "-f ${IPKGCONF_TARGET} -o ${IMAGE_ROOTFS}" 14IPKG_ARGS = "-f ${IPKGCONF_TARGET} -o ${IMAGE_ROOTFS}"
15 15
16OPKG_FEED_URIS = "" 16OPKG_PREPROCESS_COMMANDS = " \
17 package_update_index_ipk \
18 package_generate_ipkg_conf \
19"
20
21OPKG_POSTPROCESS_COMMANDS = " \
22 ipk_insert_feed_uris \
23"
17 24
18fakeroot rootfs_ipk_do_rootfs () { 25fakeroot rootfs_ipk_do_rootfs () {
19 set -x 26 set -x
20 27
21 package_update_index_ipk 28 ${OPKG_PREPROCESS_COMMANDS}
22 package_generate_ipkg_conf
23 ${OPKG_FEED_URIS}
24 29
25 mkdir -p ${T}/ 30 mkdir -p ${T}/
26 mkdir -p ${IMAGE_ROOTFS}/usr/lib/opkg/ 31 mkdir -p ${IMAGE_ROOTFS}/usr/lib/opkg/
@@ -47,6 +52,7 @@ fakeroot rootfs_ipk_do_rootfs () {
47 mkdir -p ${IMAGE_ROOTFS}/etc/opkg/ 52 mkdir -p ${IMAGE_ROOTFS}/etc/opkg/
48 grep "^arch" ${IPKGCONF_TARGET} >${IMAGE_ROOTFS}/etc/opkg/arch.conf 53 grep "^arch" ${IPKGCONF_TARGET} >${IMAGE_ROOTFS}/etc/opkg/arch.conf
49 54
55 ${OPKG_POSTPROCESS_COMMANDS}
50 ${ROOTFS_POSTINSTALL_COMMAND} 56 ${ROOTFS_POSTINSTALL_COMMAND}
51 57
52 for i in ${IMAGE_ROOTFS}${libdir}/opkg/info/*.preinst; do 58 for i in ${IMAGE_ROOTFS}${libdir}/opkg/info/*.preinst; do
@@ -142,7 +148,7 @@ python () {
142 flags = flags.replace("do_deploy", "") 148 flags = flags.replace("do_deploy", "")
143 flags = flags.replace("do_populate_staging", "") 149 flags = flags.replace("do_populate_staging", "")
144 bb.data.setVarFlag('do_rootfs', 'recrdeptask', flags, d) 150 bb.data.setVarFlag('do_rootfs', 'recrdeptask', flags, d)
145 bb.data.setVar('OPKG_FEED_URIS', 'ipk_insert_feed_uris', d) 151 bb.data.setVar('OPKG_PREPROCESS_COMMANDS', "package_generate_ipkg_conf\nipk_insert_feed_uris", d)
152 bb.data.setVar('OPKG_POSTPROCESS_COMMANDS', '', d)
146} 153}
147 154
148