[OE-core] [PATCH 12/14] bitbake.conf: fix HOSTTOOLS setting related to image testing

[Christopher Larson]

While you're at it, I'd suggest fixing this to stop using the horrible
indexing a list with a boolean hack and use a proper inline conditional.
'foo' if bar else 'baz'.

On Thu, May 31, 2018 at 1:43 AM Chen Qi <Qi.Chen at windriver.com> wrote:

> A list of tools are added to HOSTTOOLS depending on if we inherit
> testimage or not. Unfortunately, if we use TEST_IMAGE variable to
> automate the test, these tools are not added to HOSTTOOLS.
>
> Modify the condition to also check TEST_IMAGE to fix the above problem.
>
> Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
> ---
>  meta/conf/bitbake.conf | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index 6ecf78b..7b7472c 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -487,7 +487,7 @@ HOSTTOOLS += " \
>  "
>
>  # Tools needed to run testimage runtime image testing
> -HOSTTOOLS += "${@['', 'ip ping ps scp ssh
> stty'][bb.data.inherits_class('testimage', d)]}"
> +HOSTTOOLS += "${@['', 'ip ping ps scp ssh
> stty'][bb.data.inherits_class('testimage', d) or d.getVar('TEST_IMAGE') ==
> '1']}"
>
>  # Link to these if present
>  HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc sftp socat
> ssh sudo"
> --
> 1.9.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>


-- 
Christopher Larson
kergoth at gmail dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Senior Software Engineer, Mentor Graphics
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20180531/59e60486/attachment-0002.html>