summaryrefslogtreecommitdiffstats
path: root/meta/conf
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:15:00 +0100
commita9ddcc4772a1c8678adc916f24aa24add2a9e759 (patch)
treeac4f0ccb3b56d8da745af0b48ee24013849ebc40 /meta/conf
parent7937e471b6cb18f6f454523cd4ee32489b91f296 (diff)
downloadpoky-a9ddcc4772a1c8678adc916f24aa24add2a9e759.tar.gz
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 <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-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 3f63a25025..36ed144aa7 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -487,7 +487,7 @@ HOSTTOOLS += " \
487" 487"
488 488
489# Tools needed to run testimage runtime image testing 489# Tools needed to run testimage runtime image testing
490HOSTTOOLS += "${@['', 'ip ping ps scp ssh stty'][bb.data.inherits_class('testimage', d)]}" 490HOSTTOOLS += "${@'ip ping ps scp ssh stty' if (bb.data.inherits_class('testimage', d) or d.getVar('TEST_IMAGE') == '1') else ''}"
491 491
492# Link to these if present 492# Link to these if present
493HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc sftp socat ssh sudo" 493HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc sftp socat ssh sudo"