summaryrefslogtreecommitdiff
path: root/meta
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:40 +0000
commitc50a46fbd50a148146fb1f077db20cdc8121f20b (patch)
tree6405fc1e85c395801bdb8adf999165b8066f8515 /meta
parent213b5038215b1d7df10f1df0375610034fa156c7 (diff)
downloadopenembedded-core-c50a46fbd50a148146fb1f077db20cdc8121f20b.tar.gz
openembedded-core-c50a46fbd50a148146fb1f077db20cdc8121f20b.tar.bz2
openembedded-core-c50a46fbd50a148146fb1f077db20cdc8121f20b.tar.xz
openembedded-core-c50a46fbd50a148146fb1f077db20cdc8121f20b.zip
rootfs_ipk.bbclass: fix status file location in rootfs
This fixes runtime requirement checking and read-only-fs checking. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 534203524..2df8ca49e 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