From 414c3918baccc2166bba536c956eebaeb49aace3 Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Tue, 12 Feb 2013 18:12:38 +0200 Subject: rootfs_(ipk|deb|rpm).bbclass: check package installation status after ROOTFS_POSTPROCESS_COMMAND Since the intercept fall-back procedure will change the package installation status, do the checking after ROOTFS_POSTPROCESS_COMMAND ends. Signed-off-by: Laurentiu Palcu Signed-off-by: Richard Purdie --- meta/classes/rootfs_ipk.bbclass | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'meta/classes/rootfs_ipk.bbclass') diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass index fadec4d90d..135bb6026b 100644 --- a/meta/classes/rootfs_ipk.bbclass +++ b/meta/classes/rootfs_ipk.bbclass @@ -80,7 +80,12 @@ fakeroot rootfs_ipk_do_rootfs () { ${OPKG_POSTPROCESS_COMMANDS} ${ROOTFS_POSTINSTALL_COMMAND} - + + install -d ${IMAGE_ROOTFS}/${sysconfdir} + echo ${BUILDNAME} > ${IMAGE_ROOTFS}/${sysconfdir}/version + + ${ROOTFS_POSTPROCESS_COMMAND} + if ${@base_contains("IMAGE_FEATURES", "read-only-rootfs", "true", "false" ,d)}; then if grep Status:.install.ok.unpacked ${STATUS}; then bberror "Some packages could not be configured offline and rootfs is read-only." @@ -88,11 +93,6 @@ fakeroot rootfs_ipk_do_rootfs () { fi fi - install -d ${IMAGE_ROOTFS}/${sysconfdir} - echo ${BUILDNAME} > ${IMAGE_ROOTFS}/${sysconfdir}/version - - ${ROOTFS_POSTPROCESS_COMMAND} - rm -f ${IMAGE_ROOTFS}${OPKGLIBDIR}/opkg/lists/* if ${@base_contains("IMAGE_FEATURES", "package-management", "false", "true", d)}; then if ! grep Status:.install.ok.unpacked ${STATUS}; then @@ -114,7 +114,6 @@ fakeroot rootfs_ipk_do_rootfs () { remove_packaging_data_files fi fi - set +x log_check rootfs } -- cgit 1.2.3-korg