summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/testimage.bbclass2
-rw-r--r--meta/conf/bitbake.conf2
2 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index eb2181309e..6fa901b6a6 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -391,3 +391,5 @@ python () {
391 if oe.types.boolean(d.getVar("TESTIMAGE_AUTO") or "False"): 391 if oe.types.boolean(d.getVar("TESTIMAGE_AUTO") or "False"):
392 bb.build.addtask("testimage", "do_build", "do_image_complete", d) 392 bb.build.addtask("testimage", "do_build", "do_image_complete", d)
393} 393}
394
395inherit testsdk
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index c4dba61cc6..44ec869a16 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
490HOSTTOOLS += "${@'ip ping ps scp ssh stty' if (bb.utils.contains_any('IMAGE_CLASSES', 'testimage testsdk', True, False, d)) else ''}" 490HOSTTOOLS += "${@'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 ''}"
491 491
492# Link to these if present 492# Link to these if present
493HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc sftp socat ssh sudo" 493HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc sftp socat ssh sudo"