[prev in list] [next in list] [prev in thread] [next in thread]
List: openembedded-core
Subject: Re: [OE-core] [PATCH 12/14] bitbake.conf: fix HOSTTOOLS setting related to image testing
From: Christopher Larson <kergoth () gmail ! com>
Date: 2018-05-31 14:57:27
Message-ID: CABcZANmig7C5KK_+voznmgSPF9k49VQ0Esknc8p9HUX=pMz-FA () mail ! gmail ! com
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
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@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@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@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
[Attachment #5 (text/html)]
<div dir="ltr">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'.<br></div><br><div class="gmail_quote"><div \
dir="ltr">On Thu, May 31, 2018 at 1:43 AM Chen Qi <<a \
href="mailto:Qi.Chen@windriver.com">Qi.Chen@windriver.com</a>> \
wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 \
.8ex;border-left:1px #ccc solid;padding-left:1ex">A list of tools are added to \
HOSTTOOLS depending on if we inherit<br> testimage or not. Unfortunately, if we use \
TEST_IMAGE variable to<br> automate the test, these tools are not added to \
HOSTTOOLS.<br> <br>
Modify the condition to also check TEST_IMAGE to fix the above problem.<br>
<br>
Signed-off-by: Chen Qi <<a href="mailto:Qi.Chen@windriver.com" \
target="_blank">Qi.Chen@windriver.com</a>><br>
---<br>
meta/conf/bitbake.conf | 2 +-<br>
1 file changed, 1 insertion(+), 1 deletion(-)<br>
<br>
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf<br>
index 6ecf78b..7b7472c 100644<br>
--- a/meta/conf/bitbake.conf<br>
+++ b/meta/conf/bitbake.conf<br>
@@ -487,7 +487,7 @@ HOSTTOOLS += " \<br>
"<br>
<br>
# Tools needed to run testimage runtime image testing<br>
-HOSTTOOLS += "${@['', 'ip ping ps scp ssh \
stty'][bb.data.inherits_class('testimage', d)]}"<br> +HOSTTOOLS += \
"${@['', 'ip ping ps scp ssh \
stty'][bb.data.inherits_class('testimage', d) or \
d.getVar('TEST_IMAGE') == '1']}"<br> <br>
# Link to these if present<br>
HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc sftp socat ssh \
sudo"<br>
-- <br>
1.9.1<br>
<br>
-- <br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org" \
target="_blank">Openembedded-core@lists.openembedded.org</a><br> <a \
href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" \
rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</blockquote></div><br clear="all"><br>-- <br><div dir="ltr" class="gmail_signature" \
data-smartmail="gmail_signature"><div dir="ltr"><div><div dir="ltr">Christopher \
Larson<br>kergoth at gmail dot com<br>Founder - BitBake, OpenEmbedded, \
OpenZaurus<br>Senior Software Engineer, Mentor Graphics</div></div></div></div>
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic