diff options
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/rootfs_deb.bbclass | 5 | ||||
| -rw-r--r-- | meta/classes/rootfs_ipk.bbclass | 5 | ||||
| -rw-r--r-- | meta/classes/rootfs_rpm.bbclass | 5 |
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 () { | |||
| 91 | ${ROOTFS_POSTPROCESS_COMMAND} | 91 | ${ROOTFS_POSTPROCESS_COMMAND} |
| 92 | 92 | ||
| 93 | if ${@base_contains("IMAGE_FEATURES", "read-only-rootfs", "true", "false" ,d)}; then | 93 | if ${@base_contains("IMAGE_FEATURES", "read-only-rootfs", "true", "false" ,d)}; then |
| 94 | if [ -n "$(delayed_postinsts)" ]; then | 94 | delayed_postinsts="$(delayed_postinsts)" |
| 95 | bberror "Some packages could not be configured offline and rootfs is read-only." | 95 | if [ -n "$delayed_postinsts" ]; then |
| 96 | bberror "The following packages could not be configured offline and rootfs is read-only: $delayed_postinsts" | ||
| 96 | exit 1 | 97 | exit 1 |
| 97 | fi | 98 | fi |
| 98 | fi | 99 | 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 () { | |||
| 89 | ${ROOTFS_POSTPROCESS_COMMAND} | 89 | ${ROOTFS_POSTPROCESS_COMMAND} |
| 90 | 90 | ||
| 91 | if ${@base_contains("IMAGE_FEATURES", "read-only-rootfs", "true", "false" ,d)}; then | 91 | if ${@base_contains("IMAGE_FEATURES", "read-only-rootfs", "true", "false" ,d)}; then |
| 92 | if [ -n "$(delayed_postinsts)" ]; then | 92 | delayed_postinsts="$(delayed_postinsts)" |
| 93 | bberror "Some packages could not be configured offline and rootfs is read-only." | 93 | if [ -n "$delayed_postinsts" ]; then |
| 94 | bberror "The following packages could not be configured offline and rootfs is read-only: $delayed_postinsts" | ||
| 94 | exit 1 | 95 | exit 1 |
| 95 | fi | 96 | fi |
| 96 | fi | 97 | 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 () { | |||
| 115 | 115 | ||
| 116 | if ${@base_contains("IMAGE_FEATURES", "read-only-rootfs", "true", "false" ,d)}; then | 116 | if ${@base_contains("IMAGE_FEATURES", "read-only-rootfs", "true", "false" ,d)}; then |
| 117 | if [ -d ${IMAGE_ROOTFS}${sysconfdir}/rpm-postinsts ] ; then | 117 | if [ -d ${IMAGE_ROOTFS}${sysconfdir}/rpm-postinsts ] ; then |
| 118 | if [ "`ls -A ${IMAGE_ROOTFS}${sysconfdir}/rpm-postinsts`" != "" ] ; then | 118 | failed_pkgs=$(ls -A ${IMAGE_ROOTFS}${sysconfdir}/rpm-postinsts) |
| 119 | bberror "Some packages could not be configured offline and rootfs is read-only." | 119 | if [ -n "$failed_pkgs" ] ; then |
| 120 | bberror "The following post-install scripts could not be run offline and rootfs is read-only: $failed_pkgs" | ||
| 120 | exit 1 | 121 | exit 1 |
| 121 | fi | 122 | fi |
| 122 | fi | 123 | fi |