[oe-commits] [openembedded-core] 01/01: bitbake.conf: Allow BBINCLUDED to be unset

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 40a904bf8bc1279c3da0893c003f740f1d2066c2
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Thu Jun 28 12:25:12 2018 +0100

    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 at linuxfoundation.org>
---
 meta/conf/bitbake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index fbf5669..8f73854 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"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.