bitbake.conf/testimage: Add in compatiblity hacks

The testimage changes break the autobuilder. The plan is to revert these hacks
but due to various changes happening with the autobuilder, we need these for now
to keep things working until we can move to the new autobuilder codebase.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index eb2181309e1d8021fb2c9327ae30532db1cdadf4..6fa901b6a61e47b5647e40c8ed33d6a6b5c3eead 100644 (file)
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -391,3 +391,5 @@ python () {
     if oe.types.boolean(d.getVar("TESTIMAGE_AUTO") or "False"):
         bb.build.addtask("testimage", "do_build", "do_image_complete", d)
 }
+
+inherit testsdk

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index c4dba61cc6b2e132202d228c2cf6418cca4e89ff..44ec869a1675be0d325c2f19383c864f080a87ea 100644 (file)
--- 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)) 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") 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"