diff options
| author | Jeffrey C Honig <jeffrey.honig@windriver.com> | 2013-11-21 01:34:41 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-22 14:08:33 +0000 |
| commit | 33c97ee94ded3f3e5e55477ce86ca0206a3afb55 (patch) | |
| tree | 52e8ceab85ba8c2171099e7b07f1d64ccb031bea | |
| parent | 739fba172c20d1951283757bad50d79d181b40aa (diff) | |
| download | ast2050-yocto-poky-33c97ee94ded3f3e5e55477ce86ca0206a3afb55.zip ast2050-yocto-poky-33c97ee94ded3f3e5e55477ce86ca0206a3afb55.tar.gz | |
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 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>
| -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 b1c52f9..8613032 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 b0805dc..6ce3e5d 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 6c68ac8..1a0c225 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 |
