aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2017-09-30 16:15:42 +0800
committerMartin Jansa <Martin.Jansa@gmail.com>2018-02-01 12:22:48 +0000
commit24e83962fa44e33a8165159f9f983153a1dda9ba (patch)
tree7eb31812f8c47dd29c20605d236b872310b68a56
parent2c61e60cc5fe635774e88c1e34646a32a9ad918b (diff)
downloadopenembedded-core-contrib-jansa/pyro-backports.zip
openembedded-core-contrib-jansa/pyro-backports.tar.gz
openembedded-core-contrib-jansa/pyro-backports.tar.bz2
bitbake.conf: add tools required by testimage to HOSTTOOLS conditionallyjansa/pyro-backports
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>
-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 2dac3a1..f3994fc 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"