summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-01-16 18:09:27 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-18 13:28:05 +0000
commit8ca0d592c5c266741ea00bc2629ef031506f834e (patch)
tree3e4c9a40fddaf92bae257a8c3c57aa3c9a89ec6b /meta/classes
parent5e4671b30d48b183ebe71234a3b9dedf6d25d2b8 (diff)
downloadpoky-8ca0d592c5c266741ea00bc2629ef031506f834e.tar.gz
classes/rootfs_*: error out if postinstalls exist with read-only rootfs
If there are postinstall scripts to be run on first boot and IMAGE_FEATURES contains "read-only-rootfs", we know this will fail on the target device so just error out during do_rootfs. This check was already implemented for ipk, so add it to the deb and rpm backends. Also make all backends use bberror rather than just echo to display the error. Fixes [YOCTO #3407]. (From OE-Core rev: 510e377f252dece8850487c30482f83df4a89c7e) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/rootfs_deb.bbclass7
-rw-r--r--meta/classes/rootfs_ipk.bbclass2
-rw-r--r--meta/classes/rootfs_rpm.bbclass9
3 files changed, 17 insertions, 1 deletions
diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass
index 293953df3e..99979961ea 100644
--- a/meta/classes/rootfs_deb.bbclass
+++ b/meta/classes/rootfs_deb.bbclass
@@ -70,6 +70,13 @@ fakeroot rootfs_deb_do_rootfs () {
70 70
71 set -e 71 set -e
72 72
73 if ${@base_contains("IMAGE_FEATURES", "read-only-rootfs", "true", "false" ,d)}; then
74 if grep Status:.install.ok.unpacked ${IMAGE_ROOTFS}/var/lib/dpkg/status; then
75 bberror "Some packages could not be configured offline and rootfs is read-only."
76 exit 1
77 fi
78 fi
79
73 install -d ${IMAGE_ROOTFS}/${sysconfdir} 80 install -d ${IMAGE_ROOTFS}/${sysconfdir}
74 echo ${BUILDNAME} > ${IMAGE_ROOTFS}/${sysconfdir}/version 81 echo ${BUILDNAME} > ${IMAGE_ROOTFS}/${sysconfdir}/version
75 82
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index 5c962de11b..0e2fa12ac9 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -83,7 +83,7 @@ fakeroot rootfs_ipk_do_rootfs () {
83 83
84 if ${@base_contains("IMAGE_FEATURES", "read-only-rootfs", "true", "false" ,d)}; then 84 if ${@base_contains("IMAGE_FEATURES", "read-only-rootfs", "true", "false" ,d)}; then
85 if grep Status:.install.ok.unpacked ${STATUS}; then 85 if grep Status:.install.ok.unpacked ${STATUS}; then
86 echo "Some packages could not be configured offline and rootfs is read-only." 86 bberror "Some packages could not be configured offline and rootfs is read-only."
87 exit 1 87 exit 1
88 fi 88 fi
89 fi 89 fi
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index 2bfd1b779e..7d789cc8fd 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -87,6 +87,15 @@ fakeroot rootfs_rpm_do_rootfs () {
87 87
88 ${ROOTFS_POSTINSTALL_COMMAND} 88 ${ROOTFS_POSTINSTALL_COMMAND}
89 89
90 if ${@base_contains("IMAGE_FEATURES", "read-only-rootfs", "true", "false" ,d)}; then
91 if [ -d ${IMAGE_ROOTFS}/etc/rpm-postinsts ] ; then
92 if [ "`ls -A ${IMAGE_ROOTFS}/etc/rpm-postinsts`" != "" ] ; then
93 bberror "Some packages could not be configured offline and rootfs is read-only."
94 exit 1
95 fi
96 fi
97 fi
98
90 # Report delayed package scriptlets 99 # Report delayed package scriptlets
91 for i in ${IMAGE_ROOTFS}/etc/rpm-postinsts/*; do 100 for i in ${IMAGE_ROOTFS}/etc/rpm-postinsts/*; do
92 if [ -f $i ]; then 101 if [ -f $i ]; then