From d2701a747209b99e816655eb5f70a2bf666c4314 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Fri, 1 Jun 2018 13:03:09 +0800 Subject: [PATCH] bitbake.conf: fix HOSTTOOLS setting related to image testing A list of tools are added to HOSTTOOLS depending on if we inherit testimage or not. Unfortunately, if we use TEST_IMAGE variable to automate the test, these tools are not added to HOSTTOOLS. Modify the condition to also check TEST_IMAGE to fix the above problem. Also, change to use if...else... instead of list index for such setting. (From OE-Core rev: 263f8ad612674b0b47cd980212556332c17cb370) Signed-off-by: Chen Qi Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- 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 cd0f249e65..9852ee1308 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -487,7 +487,7 @@ HOSTTOOLS += " \ " # Tools needed to run testimage runtime image testing -HOSTTOOLS += "${@['', 'ip ping ps scp ssh stty'][bb.data.inherits_class('testimage', d)]}" +HOSTTOOLS += "${@'ip ping ps scp ssh stty' if (bb.data.inherits_class('testimage', d) or d.getVar('TEST_IMAGE') == '1') else ''}" # Link to these if present HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc sftp socat ssh sudo" -- 2.40.1