summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2017-10-16 10:20:41 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-10-16 23:52:44 +0100
commit885fd98f0cb80973122a9a9589d318e855ff8615 (patch)
tree564f34e836f207813e029ba400b00ae324bf0dd1
parent001f8ee0adf703f0a9f90ae9e8f3674935a18c2c (diff)
downloadpoky-885fd98f0cb80973122a9a9589d318e855ff8615.tar.gz
poky-885fd98f0cb80973122a9a9589d318e855ff8615.tar.bz2
poky-885fd98f0cb80973122a9a9589d318e855ff8615.zip
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>
-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 0eefb86d13..4fba9d6f02 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 += "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"