aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2018-06-01 13:03:09 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-04 15:14:43 +0100
commit263f8ad612674b0b47cd980212556332c17cb370 (patch)
treeaa5eb557bd9c11cc9d169186828f2a25ed5a3772
parentbc6839394c06bb695b92b2183337e7381da1e86c (diff)
downloadopenembedded-core-contrib-263f8ad612674b0b47cd980212556332c17cb370.tar.gz
openembedded-core-contrib-263f8ad612674b0b47cd980212556332c17cb370.tar.bz2
openembedded-core-contrib-263f8ad612674b0b47cd980212556332c17cb370.zip
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. Signed-off-by: Chen Qi <Qi.Chen@windriver.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 3f63a250251..36ed144aa78 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"