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)

(From OE-Core rev: 2820f7fa411e5ca1cd7df765896b43716418340a)

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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

3 files changed, 9 insertions, 6 deletions

diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass
index b1c52f9dd6..8613032f2a 100644
--- 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 b0805dc329..6ce3e5d908 100644
--- 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 6c68ac89fb..1a0c2255a9 100644
--- 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