[pyro][PATCH] bitbake.conf: add tools required by testimage to HOSTTOOLS conditionally

[pyro][PATCH] bitbake.conf: add tools required by testimage to HOSTTOOLS conditionally

[Martin Jansa]

From: Chen Qi <Qi.Chen@windriver.com>

Add tools required by testimage to HOSTTOOLS only when testimage is
inherited. These tools, as described in the comment, are only required
by the testimage task. So this change should not have negtive effect.
This would also solve build error on hosts which miss some tool such as scp.

Cherry-picked from rocko 8ca61a5464743ff85b6d26886112750d6ddd13e0

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.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 2dac3a1481..f3994fc642 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -469,7 +469,7 @@ HOSTTOOLS += " \
 "
 
 # Tools needed to run testimage runtime image testing
-HOSTTOOLS += "ip ping ps scp ssh stty"
+HOSTTOOLS += "${@['', 'ip ping ps scp ssh stty'][bb.data.inherits_class('testimage', d)]}"
 
 # Link to these if present
 HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc sftp socat sudo"
-- 
2.15.1

Re: [pyro][PATCH] bitbake.conf: add tools required by testimage to HOSTTOOLS conditionally

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1524 bytes --]

50e7619aebae5351e9a41fe1b909a31b9e383f0a bitbake.conf: add ssh to
HOSTTOOLS_NONFATAL

should be cherry-picked together with this one.


On Thu, Feb 1, 2018 at 1:22 PM, Martin Jansa <martin.jansa@gmail.com> wrote:

> From: Chen Qi <Qi.Chen@windriver.com>
>
> Add tools required by testimage to HOSTTOOLS only when testimage is
> inherited. These tools, as described in the comment, are only required
> by the testimage task. So this change should not have negtive effect.
> This would also solve build error on hosts which miss some tool such as
> scp.
>
> Cherry-picked from rocko 8ca61a5464743ff85b6d26886112750d6ddd13e0
>
> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.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 2dac3a1481..f3994fc642 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -469,7 +469,7 @@ HOSTTOOLS += " \
>  "
>
>  # Tools needed to run testimage runtime image testing
> -HOSTTOOLS += "ip ping ps scp ssh stty"
> +HOSTTOOLS += "${@['', 'ip ping ps scp ssh stty'][bb.data.inherits_class('testimage',
> d)]}"
>
>  # Link to these if present
>  HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc sftp socat
> sudo"
> --
> 2.15.1
>
>

[-- Attachment #2: Type: text/html, Size: 2317 bytes --]

[pyro][PATCH] bitbake.conf: add ssh to HOSTTOOLS_NONFATAL

[Martin Jansa]

From: Chen Qi <Qi.Chen@windriver.com>

We changed to make tools required by testimage to be included conditionally.
This resulted in users who use ssh for git fetching having failures.

Add ssh to HOSTTOOLS_NONFATAL to make things work for the above situation.

[YOCTO #12227]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.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 f3994fc642..e2383d2709 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -472,7 +472,7 @@ HOSTTOOLS += " \
 HOSTTOOLS += "${@['', 'ip ping ps scp ssh stty'][bb.data.inherits_class('testimage', d)]}"
 
 # Link to these if present
-HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc sftp socat sudo"
+HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc sftp socat ssh sudo"
 
 # Temporary add few more detected in bitbake world
 HOSTTOOLS_NONFATAL += "join nl size yes zcat"
-- 
2.15.1

Re: [pyro][PATCH] bitbake.conf: add ssh to HOSTTOOLS_NONFATAL

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]

ping

On Mon, Feb 12, 2018 at 11:19 AM, Martin Jansa <martin.jansa@gmail.com>
wrote:

> From: Chen Qi <Qi.Chen@windriver.com>
>
> We changed to make tools required by testimage to be included
> conditionally.
> This resulted in users who use ssh for git fetching having failures.
>
> Add ssh to HOSTTOOLS_NONFATAL to make things work for the above situation.
>
> [YOCTO #12227]
>
> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> Signed-off-by: Ross Burton <ross.burton@intel.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 f3994fc642..e2383d2709 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -472,7 +472,7 @@ HOSTTOOLS += " \
>  HOSTTOOLS += "${@['', 'ip ping ps scp ssh stty'][bb.data.inherits_class('testimage',
> d)]}"
>
>  # Link to these if present
> -HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc sftp socat
> sudo"
> +HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc sftp socat
> ssh sudo"
>
>  # Temporary add few more detected in bitbake world
>  HOSTTOOLS_NONFATAL += "join nl size yes zcat"
> --
> 2.15.1
>
>

[-- Attachment #2: Type: text/html, Size: 1871 bytes --]

Re: [pyro][PATCH] bitbake.conf: add ssh to HOSTTOOLS_NONFATAL

[Richard Purdie]

On Sun, 2018-03-04 at 12:41 +0100, Martin Jansa wrote:
> ping

I've merged this.

Cheers,

Richard

Re: [pyro][PATCH] bitbake.conf: add ssh to HOSTTOOLS_NONFATAL

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 396 bytes --]

Thanks,

please don't forget to include
[pyro][PATCH] bitbake.conf: add tools required by testimage to HOSTTOOLS
conditionally
as well (currently missing in pyro-next).

On Sun, Mar 4, 2018 at 2:20 PM, Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> On Sun, 2018-03-04 at 12:41 +0100, Martin Jansa wrote:
> > ping
>
> I've merged this.
>
> Cheers,
>
> Richard
>

[-- Attachment #2: Type: text/html, Size: 769 bytes --]

✗ patchtest: failure for bitbake.conf: add tools required by testimage to HOSTTOOLS conditionally (rev3)

[Patchwork]

== Series Details ==

Series: bitbake.conf: add tools required by testimage to HOSTTOOLS conditionally (rev3)
Revision: 3
URL   : https://patchwork.openembedded.org/series/9179/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue             Series does not apply on top of target branch [test_series_merge_on_head] 
  Suggested fix    Rebase your series on top of targeted branch
  Targeted branch  pyro (currently at 2c61e60cc5)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

Re: [pyro][PATCH] bitbake.conf: add tools required by testimage to HOSTTOOLS conditionally

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1390 bytes --]

ping

On Thu, Feb 1, 2018 at 1:22 PM, Martin Jansa <martin.jansa@gmail.com> wrote:

> From: Chen Qi <Qi.Chen@windriver.com>
>
> Add tools required by testimage to HOSTTOOLS only when testimage is
> inherited. These tools, as described in the comment, are only required
> by the testimage task. So this change should not have negtive effect.
> This would also solve build error on hosts which miss some tool such as
> scp.
>
> Cherry-picked from rocko 8ca61a5464743ff85b6d26886112750d6ddd13e0
>
> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.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 2dac3a1481..f3994fc642 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -469,7 +469,7 @@ HOSTTOOLS += " \
>  "
>
>  # Tools needed to run testimage runtime image testing
> -HOSTTOOLS += "ip ping ps scp ssh stty"
> +HOSTTOOLS += "${@['', 'ip ping ps scp ssh stty'][bb.data.inherits_class('testimage',
> d)]}"
>
>  # Link to these if present
>  HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc sftp socat
> sudo"
> --
> 2.15.1
>
>

[-- Attachment #2: Type: text/html, Size: 2145 bytes --]