Patchwork [2/3] rootfs_ipk.bbclass: fix status file location in rootfs

login
register
mail settings
Submitter Otavio Salvador
Date Feb. 17, 2012, 5:47 p.m.
Message ID <5b0cfff77008235fbfb87833349ed7ff6247d0fa.1329500798.git.otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/21379/
State Accepted
Commit c50a46fbd50a148146fb1f077db20cdc8121f20b
Headers show

Comments

Otavio Salvador - Feb. 17, 2012, 5:47 p.m.
This fixes runtime requirement checking and read-only-fs checking.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/classes/rootfs_ipk.bbclass |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

Patch

diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index 5342035..2df8ca4 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