From 826c1a1e44026820c138305e2b5c60154f08823b Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 17 Feb 2012 17:47:04 +0000 Subject: rootfs_ipk.bbclass: fix status file location in rootfs This fixes runtime requirement checking and read-only-fs checking. (From OE-Core rev: c50a46fbd50a148146fb1f077db20cdc8121f20b) Signed-off-by: Otavio Salvador Signed-off-by: Richard Purdie --- meta/classes/rootfs_ipk.bbclass | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass index 5342035241..2df8ca49e2 100644 --- a/meta/classes/rootfs_ipk.bbclass +++ b/meta/classes/rootfs_ipk.bbclass @@ -76,7 +76,7 @@ fakeroot rootfs_ipk_do_rootfs () { ${ROOTFS_POSTINSTALL_COMMAND} if ${@base_contains("IMAGE_FEATURES", "read-only-rootfs", "true", "false" ,d)}; then - if grep Status:.install.ok.unpacked ${IMAGE_ROOTFS}${opkglibdir}status; then + if grep Status:.install.ok.unpacked ${STATUS}; then echo "Some packages could not be configured offline and rootfs is read-only." exit 1 fi @@ -88,9 +88,8 @@ fakeroot rootfs_ipk_do_rootfs () { ${ROOTFS_POSTPROCESS_COMMAND} rm -f ${IMAGE_ROOTFS}${opkglibdir}/lists/* - if ${@base_contains("IMAGE_FEATURES", "package-management", "false", "true", d)}; then - if ! grep Status:.install.ok.unpacked ${IMAGE_ROOTFS}${opkglibdir}status; then + if ! grep Status:.install.ok.unpacked ${STATUS}; then # All packages were successfully configured. # update-rc.d, base-passwd are no further use, remove them now opkg-cl ${IPKG_ARGS} --force-depends remove update-rc.d base-passwd || true -- cgit v1.2.3-54-g00ecf