From c7c64baa411fd96886918c235b851ae3e5a6a61f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 28 Jun 2018 12:25:12 +0100 Subject: 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 --- meta/conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/conf') 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" -- cgit v1.2.3-54-g00ecf