diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-10-01 15:52:19 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-10-01 15:52:19 +0000 |
| commit | beee0c51f2b4aa5e40b82a9f2f203f9809196dae (patch) | |
| tree | 4ec92d865d5e6ee6fa828978cd1a8c458fd5e1ba | |
| parent | 39b0cfa2bd4ed016d4fd49de7d26a61d8ebb84f8 (diff) | |
| download | openembedded-core-beee0c51f2b4aa5e40b82a9f2f203f9809196dae.tar.gz openembedded-core-beee0c51f2b4aa5e40b82a9f2f203f9809196dae.tar.bz2 openembedded-core-beee0c51f2b4aa5e40b82a9f2f203f9809196dae.tar.xz openembedded-core-beee0c51f2b4aa5e40b82a9f2f203f9809196dae.zip | |
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
| -rw-r--r-- | meta/classes/rootfs_ipk.bbclass | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass index 2f1290ee5..9663d7aa7 100644 --- a/meta/classes/rootfs_ipk.bbclass +++ b/meta/classes/rootfs_ipk.bbclass @@ -13,14 +13,19 @@ do_rootfs[recrdeptask] += "do_package_write_ipk" IPKG_ARGS = "-f ${IPKGCONF_TARGET} -o ${IMAGE_ROOTFS}" -OPKG_FEED_URIS = "" +OPKG_PREPROCESS_COMMANDS = " \ + package_update_index_ipk \ + package_generate_ipkg_conf \ +" + +OPKG_POSTPROCESS_COMMANDS = " \ + ipk_insert_feed_uris \ +" fakeroot rootfs_ipk_do_rootfs () { set -x - package_update_index_ipk - package_generate_ipkg_conf - ${OPKG_FEED_URIS} + ${OPKG_PREPROCESS_COMMANDS} mkdir -p ${T}/ mkdir -p ${IMAGE_ROOTFS}/usr/lib/opkg/ @@ -47,6 +52,7 @@ fakeroot rootfs_ipk_do_rootfs () { mkdir -p ${IMAGE_ROOTFS}/etc/opkg/ grep "^arch" ${IPKGCONF_TARGET} >${IMAGE_ROOTFS}/etc/opkg/arch.conf + ${OPKG_POSTPROCESS_COMMANDS} ${ROOTFS_POSTINSTALL_COMMAND} for i in ${IMAGE_ROOTFS}${libdir}/opkg/info/*.preinst; do @@ -142,7 +148,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_FEED_URIS', 'ipk_insert_feed_uris', d) + bb.data.setVar('OPKG_PREPROCESS_COMMANDS', "package_generate_ipkg_conf\nipk_insert_feed_uris", d) + bb.data.setVar('OPKG_POSTPROCESS_COMMANDS', '', d) } - |