summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2018-02-01 12:22:18 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-04 13:31:02 (GMT)
commit30adf2653a3d896241b34f5516055ef6f980e131 (patch)
tree51a8c6b4173f70485f7df529860d651966457bec
parent3e7d531c59374d3f41305ac4c9e262d6d675c7fd (diff)
downloadpoky-30adf2653a3d896241b34f5516055ef6f980e131.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. Cherry-picked from rocko 8ca61a5464743ff85b6d26886112750d6ddd13e0 (From OE-Core rev: 189d8282e82381d65c8cc9efe1896f628e9632bd) 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> 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 3ef7f7a..e2383d2 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -469,7 +469,7 @@ HOSTTOOLS += " \
469" 469"
470 470
471# Tools needed to run testimage runtime image testing 471# Tools needed to run testimage runtime image testing
472HOSTTOOLS += "ip ping ps scp ssh stty" 472HOSTTOOLS += "${@['', 'ip ping ps scp ssh stty'][bb.data.inherits_class('testimage', d)]}"
473 473
474# Link to these if present 474# Link to these if present
475HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc sftp socat ssh sudo" 475HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc sftp socat ssh sudo"