rootfs_*.bbclass: List which post-install scripts can not be run

When preping a read-only rootfs and finding some post-install
scripts that can not be run, list the names of said scripts to
avoid having to look around the rootfs to find a list.

(From OE-Core master rev: 0188120691f433fdccf71b92618115195278c0af)

Signed-off-by: Jeffrey C Honig <jeffrey.honig@windriver.com>
Signed-off-by: Jeff Polk <jeff.polk@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>

diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass
index b1c52f9dd695ef862224794f99d12a0a0201542a..8613032f2aaa574d4e6ffb8633791351ee27f55c 100644 (file)
--- a/meta/classes/rootfs_deb.bbclass
+++ b/meta/classes/rootfs_deb.bbclass
@@ -91,8 +91,9 @@ fakeroot rootfs_deb_do_rootfs () {
        ${ROOTFS_POSTPROCESS_COMMAND}
 
        if ${@base_contains("IMAGE_FEATURES", "read-only-rootfs", "true", "false" ,d)}; then
-               if [ -n "$(delayed_postinsts)" ]; then
-                       bberror "Some packages could not be configured offline and rootfs is read-only."
+               delayed_postinsts="$(delayed_postinsts)"
+               if [ -n "$delayed_postinsts" ]; then
+                       bberror "The following packages could not be configured offline and rootfs is read-only: $delayed_postinsts"
                        exit 1
                fi
        fi

diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index b0805dc3297980b8235394a4813ecca45df833d4..6ce3e5d908a6e377f1e7e7615d3e5cef29e041b8 100644 (file)
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -89,8 +89,9 @@ fakeroot rootfs_ipk_do_rootfs () {
        ${ROOTFS_POSTPROCESS_COMMAND}
 
        if ${@base_contains("IMAGE_FEATURES", "read-only-rootfs", "true", "false" ,d)}; then
-               if [ -n "$(delayed_postinsts)" ]; then
-                       bberror "Some packages could not be configured offline and rootfs is read-only."
+               delayed_postinsts="$(delayed_postinsts)"
+               if [ -n "$delayed_postinsts" ]; then
+                       bberror "The following packages could not be configured offline and rootfs is read-only: $delayed_postinsts"
                        exit 1
                fi
        fi

diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index 6c68ac89fb4aa08a56ecbb97eaa2738fadc70538..1a0c2255a9f5c4e5176a23b3e9f6e7040d11d4aa 100644 (file)
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -115,8 +115,9 @@ fakeroot rootfs_rpm_do_rootfs () {
 
        if ${@base_contains("IMAGE_FEATURES", "read-only-rootfs", "true", "false" ,d)}; then
                if [ -d ${IMAGE_ROOTFS}${sysconfdir}/rpm-postinsts ] ; then
-                       if [ "`ls -A ${IMAGE_ROOTFS}${sysconfdir}/rpm-postinsts`" != "" ] ; then
-                               bberror "Some packages could not be configured offline and rootfs is read-only."
+                       failed_pkgs=$(ls -A ${IMAGE_ROOTFS}${sysconfdir}/rpm-postinsts)
+                       if [ -n "$failed_pkgs" ] ; then
+                               bberror "The following post-install scripts could not be run offline and rootfs is read-only: $failed_pkgs"
                                exit 1
                        fi
                fi