[OE-core] [PATCH] meta/classes/testimage.bbclass: Only validate IMAGE_FSTYPES when is QEMU
richard.purdie at linuxfoundation.org
richard.purdie at linuxfoundation.org
Sat Oct 20 07:11:19 UTC 2018
On Tue, 2018-10-16 at 18:21 -0500, Aníbal Limón wrote:
> When use simpleremote target the flash/boot process is executed
> manually, the IMAGE_FSTYPES validation is only needed when execute
> testimage against qemu.
>
> The supported_fstypes comes from oeqa.core.target.qemu module.
>
> Signed-off-by: Aníbal Limón <anibal.limon at linaro.org>
> ---
> meta/classes/testimage.bbclass | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
> index 2642a722e7..734cb7caae 100644
> --- a/meta/classes/testimage.bbclass
> +++ b/meta/classes/testimage.bbclass
> @@ -194,12 +194,13 @@ def testimage_main(d):
> machine = d.getVar("MACHINE")
>
> # Get rootfs
> - fstypes = [fs for fs in d.getVar('IMAGE_FSTYPES').split(' ')
> - if fs in supported_fstypes]
> - if not fstypes:
> - bb.fatal('Unsupported image type built. Add a comptible image to '
> - 'IMAGE_FSTYPES. Supported types: %s' %
> - ', '.join(supported_fstypes))
> + fstypes = d.getVar('IMAGE_FSTYPES')
> + if d.getVar("TEST_TARGET") == "qemu":
> + fstypes = [fs for fs in fstypes if fs in supported_fstypes]
> + if not fstypes:
> + bb.fatal('Unsupported image type built. Add a comptible image to '
> + 'IMAGE_FSTYPES. Supported types: %s' %
> + ', '.join(supported_fstypes))
> rootfs = '%s.%s' % (image_name, fstypes[0])
>
> # Get tmpdir (not really used, just for compatibility)
This causes the autobuilder to break and there is a bug in the logic
above:
https://autobuilder.yoctoproject.org/typhoon/#/builders/32/builds/128/steps/7/logs/step1c
(one of many failures as everything broke)
Cheers,
Richard
More information about the Openembedded-core
mailing list