[PATCH 0/1] bitbake.conf: add ssh to HOSTTOOLS_NONFATAL

[PATCH 0/1] bitbake.conf: add ssh to HOSTTOOLS_NONFATAL

[Chen Qi]

The following changes since commit 96967261993f8b583b51cdeccbb1fd06042d2192:

  bitbake: toaster/highlight.pack.js: Fix corrupted file (2017-10-10 11:05:08 +0100)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib ChenQi/bug12227
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/bug12227

Chen Qi (1):
  bitbake.conf: add ssh to HOSTTOOLS_NONFATAL

 meta/conf/bitbake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
1.9.1

[PATCH 1/1] bitbake.conf: add ssh to HOSTTOOLS_NONFATAL

[Chen Qi]

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>
---
 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 0eefb86..2351c66 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -487,7 +487,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 += "ssh aws ccache gcc-ar gpg ld.bfd ld.gold nc sftp socat sudo"
 
 # Temporary add few more detected in bitbake world
 HOSTTOOLS_NONFATAL += "join nl size yes zcat"
-- 
1.9.1

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

[Martin Jansa]

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

On Mon, Oct 16, 2017 at 10:20:41AM +0800, Chen Qi wrote:
> 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>
> ---
>  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 0eefb86..2351c66 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -487,7 +487,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 += "ssh aws ccache gcc-ar gpg ld.bfd ld.gold nc sftp socat sudo"

Maybe keep the alphabetical order as it was intentionally sorted in:

commit 23dd96a3a175cecde258dc6d8263fbe7b308b58e
Author: Andre McCurdy <armccurdy@gmail.com>
Date:   Mon Mar 27 20:51:23 2017 -0700

    bitbake.conf: sort HOSTTOOLS and remove duplicates

other than that I'm fine with this.

>  
>  # Temporary add few more detected in bitbake world
>  HOSTTOOLS_NONFATAL += "join nl size yes zcat"
> -- 
> 1.9.1
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]