aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2017-09-30 16:15:42 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-10-09 10:04:40 +0100
commit8ca61a5464743ff85b6d26886112750d6ddd13e0 (patch)
tree08fc8127905bab7329b0ddb51c3525bbe1b1e042
parentd2631f45a057c53797b7ba657662f35f66a2b04e (diff)
downloadopenembedded-core-contrib-8ca61a5464743ff85b6d26886112750d6ddd13e0.tar.gz
bitbake.conf: add tools required by testimage to HOSTTOOLS conditionally
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. 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 6f53b23a67..0eefb86d13 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -484,7 +484,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"