diff options
| author | Chen Qi <Qi.Chen@windriver.com> | 2017-09-30 16:15:42 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-10-09 10:09:09 +0100 |
| commit | 7f64ac11f5aaee2d2b6f5bf52123906f98a22e1f (patch) | |
| tree | 879da4335ea09b82a7244e394f8d9a49069039ed | |
| parent | 29b0f2c08fce18d90ff68e2ced1c05b041204848 (diff) | |
| download | poky-7f64ac11f5aaee2d2b6f5bf52123906f98a22e1f.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.
(From OE-Core rev: 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>
| -rw-r--r-- | meta/conf/bitbake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 6f53b23a67..0eefb86d13 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
| @@ -484,7 +484,7 @@ HOSTTOOLS += " \ | |||
| 484 | " | 484 | " |
| 485 | 485 | ||
| 486 | # Tools needed to run testimage runtime image testing | 486 | # Tools needed to run testimage runtime image testing |
| 487 | HOSTTOOLS += "ip ping ps scp ssh stty" | 487 | HOSTTOOLS += "${@['', 'ip ping ps scp ssh stty'][bb.data.inherits_class('testimage', d)]}" |
| 488 | 488 | ||
| 489 | # Link to these if present | 489 | # Link to these if present |
| 490 | HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc sftp socat sudo" | 490 | HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc sftp socat sudo" |