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

[Yang Shi]

On 4/9/2012 12:49 PM, Darren Hart wrote:
>
> On 04/09/2012 11:34 AM, Yang Shi wrote:
>> On 4/9/2012 9:31 AM, Darren Hart wrote:
>>> On 03/26/2012 02: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.
>>> The psplash only prevents interaction on the vga console right? If the
>>> BSP supports a serial console as well there is not a problem right?
>> Yes, I think so. When I was doing the test, I disabled splash so that I
>> can type 'enter' to make interaction move forward.
>>
> In that case, deleting the iso links if Unionfs is not configured in
> does not seem appropriate. A bbwarn might be appropriate, but failing
> and destroying the deploy data is certainly not.

OK, will make it throw a warning instead of removing iso images.

Thanks,
Yang

>
> --
> Darren
>
>> Thanks,
>> Yang
>>
>>> --
>>> Darren
>>>
>>>> Signed-off-by: Yang Shi<yang.shi at 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