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:33 +0100 |
commit | 40a904bf8bc1279c3da0893c003f740f1d2066c2 (patch) | |
tree | e51fb3d8b8f52492e12a9f1100f7596fa3fbab77 | |
parent | 2dfbff215f3567252fdfbd5704e6740a30ad41b4 (diff) | |
download | openembedded-core-40a904bf8bc1279c3da0893c003f740f1d2066c2.tar.gz openembedded-core-40a904bf8bc1279c3da0893c003f740f1d2066c2.tar.bz2 openembedded-core-40a904bf8bc1279c3da0893c003f740f1d2066c2.zip |
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.
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 fbf5669ddd..8f73854599 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' 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 ''}" +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 ''}" # Link to these if present HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc sftp socat ssh sudo" |