diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-28 12:25:12 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-28 12:26:54 +0100 |
commit | c7c64baa411fd96886918c235b851ae3e5a6a61f (patch) | |
tree | 9b9d987d4d550ed71f13b31d8574b9bebda725eb /meta/conf/bitbake.conf | |
parent | 7cf964d611a20ef47a373c14f25dcc65630ae3cb (diff) | |
download | poky-c7c64baa411fd96886918c235b851ae3e5a6a61f.tar.gz |
bitbake.conf: Allow BBINCLUDED to be unset
For some reason the layer index is expanding HOSTTOOLS before BBINCLUDED is
set so recent changes break it. This adds in a simple workaround to stop it b
reaking allowing the index to function correctly again.
(From OE-Core rev: 40a904bf8bc1279c3da0893c003f740f1d2066c2)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/bitbake.conf')
-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 fbf5669ddd..8f73854599 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 |
490 | HOSTTOOLS += "${@'ip ping ps scp ssh stty' if (bb.utils.contains_any('IMAGE_CLASSES', 'testimage testsdk', True, False, d) or any(x in d.getVar("BBINCLUDED") for x in ["testimage.bbclass", "testsdk.bbclass"])) else ''}" | 490 | HOSTTOOLS += "${@'ip ping ps scp ssh stty' if (bb.utils.contains_any('IMAGE_CLASSES', 'testimage testsdk', True, False, d) or any(x in (d.getVar("BBINCLUDED") or "") for x in ["testimage.bbclass", "testsdk.bbclass"])) else ''}" |
491 | 491 | ||
492 | # Link to these if present | 492 | # Link to these if present |
493 | HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc sftp socat ssh sudo" | 493 | HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc sftp socat ssh sudo" |