summaryrefslogtreecommitdiffstats
path: root/meta/classes/rootfs_ipk.bbclass
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2012-02-17 17:47:04 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-24 00:45:44 +0000
commit826c1a1e44026820c138305e2b5c60154f08823b (patch)
tree77d6d972cff96e44a4c8d53f78fc10c73c655428 /meta/classes/rootfs_ipk.bbclass
parentcc2ef82c0c456e40ada94b5a23c3cf8384198785 (diff)
downloadpoky-826c1a1e44026820c138305e2b5c60154f08823b.tar.gz
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 <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/rootfs_ipk.bbclass')
-rw-r--r--meta/classes/rootfs_ipk.bbclass5
1 files 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 () {
76 ${ROOTFS_POSTINSTALL_COMMAND} 76 ${ROOTFS_POSTINSTALL_COMMAND}
77 77
78 if ${@base_contains("IMAGE_FEATURES", "read-only-rootfs", "true", "false" ,d)}; then 78 if ${@base_contains("IMAGE_FEATURES", "read-only-rootfs", "true", "false" ,d)}; then
79 if grep Status:.install.ok.unpacked ${IMAGE_ROOTFS}${opkglibdir}status; then 79 if grep Status:.install.ok.unpacked ${STATUS}; then
80 echo "Some packages could not be configured offline and rootfs is read-only." 80 echo "Some packages could not be configured offline and rootfs is read-only."
81 exit 1 81 exit 1
82 fi 82 fi
@@ -88,9 +88,8 @@ fakeroot rootfs_ipk_do_rootfs () {
88 ${ROOTFS_POSTPROCESS_COMMAND} 88 ${ROOTFS_POSTPROCESS_COMMAND}
89 89
90 rm -f ${IMAGE_ROOTFS}${opkglibdir}/lists/* 90 rm -f ${IMAGE_ROOTFS}${opkglibdir}/lists/*
91
92 if ${@base_contains("IMAGE_FEATURES", "package-management", "false", "true", d)}; then 91 if ${@base_contains("IMAGE_FEATURES", "package-management", "false", "true", d)}; then
93 if ! grep Status:.install.ok.unpacked ${IMAGE_ROOTFS}${opkglibdir}status; then 92 if ! grep Status:.install.ok.unpacked ${STATUS}; then
94 # All packages were successfully configured. 93 # All packages were successfully configured.
95 # update-rc.d, base-passwd are no further use, remove them now 94 # update-rc.d, base-passwd are no further use, remove them now
96 opkg-cl ${IPKG_ARGS} --force-depends remove update-rc.d base-passwd || true 95 opkg-cl ${IPKG_ARGS} --force-depends remove update-rc.d base-passwd || true