rootfs_(ipk|deb|rpm).bbclass: check package installation status after ROOTFS_POSTPROC...

Since the intercept fall-back procedure will change the package
installation status, do the checking after ROOTFS_POSTPROCESS_COMMAND
ends.

(From OE-Core rev: 414c3918baccc2166bba536c956eebaeb49aace3)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass
index 9997996..92a6579 100644 (file)
--- a/meta/classes/rootfs_deb.bbclass
+++ b/meta/classes/rootfs_deb.bbclass
@@ -70,13 +70,6 @@ fakeroot rootfs_deb_do_rootfs () {
 
        set -e
 
-       if ${@base_contains("IMAGE_FEATURES", "read-only-rootfs", "true", "false" ,d)}; then
-               if grep Status:.install.ok.unpacked ${IMAGE_ROOTFS}/var/lib/dpkg/status; then
-                       bberror "Some packages could not be configured offline and rootfs is read-only."
-                       exit 1
-               fi
-       fi
-
        install -d ${IMAGE_ROOTFS}/${sysconfdir}
        echo ${BUILDNAME} > ${IMAGE_ROOTFS}/${sysconfdir}/version
 
@@ -91,6 +84,13 @@ fakeroot rootfs_deb_do_rootfs () {
 
        ${ROOTFS_POSTPROCESS_COMMAND}
 
+       if ${@base_contains("IMAGE_FEATURES", "read-only-rootfs", "true", "false" ,d)}; then
+               if grep Status:.install.ok.unpacked ${IMAGE_ROOTFS}/var/lib/dpkg/status; then
+                       bberror "Some packages could not be configured offline and rootfs is read-only."
+                       exit 1
+               fi
+       fi
+
        log_check rootfs
 }
 

diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index fadec4d..135bb60 100644 (file)
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -80,7 +80,12 @@ fakeroot rootfs_ipk_do_rootfs () {
 
        ${OPKG_POSTPROCESS_COMMANDS}
        ${ROOTFS_POSTINSTALL_COMMAND}
-       
+
+       install -d ${IMAGE_ROOTFS}/${sysconfdir}
+       echo ${BUILDNAME} > ${IMAGE_ROOTFS}/${sysconfdir}/version
+
+       ${ROOTFS_POSTPROCESS_COMMAND}
+
        if ${@base_contains("IMAGE_FEATURES", "read-only-rootfs", "true", "false" ,d)}; then
                if grep Status:.install.ok.unpacked ${STATUS}; then
                        bberror "Some packages could not be configured offline and rootfs is read-only."
@@ -88,11 +93,6 @@ fakeroot rootfs_ipk_do_rootfs () {
                fi
        fi
 
-       install -d ${IMAGE_ROOTFS}/${sysconfdir}
-       echo ${BUILDNAME} > ${IMAGE_ROOTFS}/${sysconfdir}/version
-
-       ${ROOTFS_POSTPROCESS_COMMAND}
-       
        rm -f ${IMAGE_ROOTFS}${OPKGLIBDIR}/opkg/lists/*
        if ${@base_contains("IMAGE_FEATURES", "package-management", "false", "true", d)}; then
                if ! grep Status:.install.ok.unpacked ${STATUS}; then
@@ -114,7 +114,6 @@ fakeroot rootfs_ipk_do_rootfs () {
                        remove_packaging_data_files
                fi
        fi
-       set +x
        log_check rootfs
 }
 

diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index 119bf92..5651243 100644 (file)
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -87,15 +87,6 @@ fakeroot rootfs_rpm_do_rootfs () {
 
        ${ROOTFS_POSTINSTALL_COMMAND}
 
-       if ${@base_contains("IMAGE_FEATURES", "read-only-rootfs", "true", "false" ,d)}; then
-               if [ -d ${IMAGE_ROOTFS}/etc/rpm-postinsts ] ; then
-                       if [ "`ls -A ${IMAGE_ROOTFS}/etc/rpm-postinsts`" != "" ] ; then
-                               bberror "Some packages could not be configured offline and rootfs is read-only."
-                               exit 1
-                       fi
-               fi
-       fi
-
        # Report delayed package scriptlets
        for i in ${IMAGE_ROOTFS}/etc/rpm-postinsts/*; do
                if [ -f $i ]; then
@@ -126,7 +117,16 @@ EOF
 
        ${RPM_POSTPROCESS_COMMANDS}
        ${ROOTFS_POSTPROCESS_COMMAND}
-       
+
+       if ${@base_contains("IMAGE_FEATURES", "read-only-rootfs", "true", "false" ,d)}; then
+               if [ -d ${IMAGE_ROOTFS}/etc/rpm-postinsts ] ; then
+                       if [ "`ls -A ${IMAGE_ROOTFS}/etc/rpm-postinsts`" != "" ] ; then
+                               bberror "Some packages could not be configured offline and rootfs is read-only."
+                               exit 1
+                       fi
+               fi
+       fi
+
        rm -rf ${IMAGE_ROOTFS}/var/cache2/
        rm -rf ${IMAGE_ROOTFS}/var/run2/
        rm -rf ${IMAGE_ROOTFS}/var/log2/