summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2017-10-16 02:20:41 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-10-16 22:52:44 (GMT)
commit885fd98f0cb80973122a9a9589d318e855ff8615 (patch)
tree564f34e836f207813e029ba400b00ae324bf0dd1 /meta
parent001f8ee0adf703f0a9f90ae9e8f3674935a18c2c (diff)
downloadpoky-885fd98f0cb80973122a9a9589d318e855ff8615.tar.gz
bitbake.conf: add ssh to HOSTTOOLS_NONFATAL
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] (From OE-Core rev: 50e7619aebae5351e9a41fe1b909a31b9e383f0a) 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>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/bitbake.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 0eefb86..4fba9d6 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -487,7 +487,7 @@ HOSTTOOLS += " \
487HOSTTOOLS += "${@['', 'ip ping ps scp ssh stty'][bb.data.inherits_class('testimage', d)]}" 487HOSTTOOLS += "${@['', 'ip ping ps scp ssh stty'][bb.data.inherits_class('testimage', d)]}"
488 488
489# Link to these if present 489# Link to these if present
490HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc sftp socat sudo" 490HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc sftp socat ssh sudo"
491 491
492# Temporary add few more detected in bitbake world 492# Temporary add few more detected in bitbake world
493HOSTTOOLS_NONFATAL += "join nl size yes zcat" 493HOSTTOOLS_NONFATAL += "join nl size yes zcat"