From 189d8282e82381d65c8cc9efe1896f628e9632bd Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Thu, 1 Feb 2018 12:22:18 +0000 Subject: [PATCH] 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" -- 2.40.1