aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2018-02-01 12:22:18 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-04 13:30:55 +0000
commit189d8282e82381d65c8cc9efe1896f628e9632bd (patch)
treef67a188b4169677b4443140cc8ddb61e48fc8f5a
parent9be68b7fd09f9925c22797b0c99a3db7d460c223 (diff)
downloadopenembedded-core-189d8282e82381d65c8cc9efe1896f628e9632bd.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 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 3ef7f7ae21..e2383d2709 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 ssh sudo"