Re: [PATCH 2/2] sato: Remove questioned ISO image

[Bruce Ashfield <bruce.ashfield@windriver.com>]

On 12-03-26 05:19 PM, Yang Shi wrote:
> [YOCTO #1487]
>
> For the liveCD image, interactive bootup is needed, but psplash prevents from
> booting interactively. In such case ISO image is not usable, so remove ISO image
> and the corresponding link and throw error info to warn outside to enable
> unionfs in kenrel.

I'm just bumping Yang's review. I worked with him on this problem
(which turned out to harder than we initially thought).

Does anyone else have better suggestions than this ? This keeps the
live image bootable and interactive when X is in play, but it has
some obvious side effects.

Cheers,

Bruce

>
> Signed-off-by: Yang Shi<yang.shi@windriver.com>
> ---
>   meta/recipes-sato/images/core-image-sato.bb |   16 ++++++++++++++++
>   1 files changed, 16 insertions(+), 0 deletions(-)
>
> diff --git a/meta/recipes-sato/images/core-image-sato.bb b/meta/recipes-sato/images/core-image-sato.bb
> index 11c3318..10e2239 100644
> --- a/meta/recipes-sato/images/core-image-sato.bb
> +++ b/meta/recipes-sato/images/core-image-sato.bb
> @@ -9,3 +9,19 @@ IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}"
>   LICENSE = "MIT"
>
>   inherit core-image
> +
> +LIVE = "${@base_contains('IMAGE_FSTYPES', 'live', 'yes', 'no', d)}"
> +
> +do_check_unionfs() {
> +        if [ "${NOISO}" = "1" ]; then
> +                return
> +        fi
> +
> +        if [ "${LIVE}" = "yes" ]&&  ! grep -q "CONFIG_UNION_FS=y" ${STAGING_KERNEL_DIR}/.config; then
> +                rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.iso
> +                rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.iso
> +                bbfatal "Building LIVE CD without UNION FS enabled in kernel"
> +        fi
> +}
> +
> +addtask check_unionfs before do_build after do_bootimg