summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-20 10:30:24 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-21 09:34:40 +0100
commit1bbcc5931e7af670b185e58f897a43109f80a958 (patch)
treec5ad267c46e452b344388386bbb309d89fa52182
parente8a83596419a48f7184fb79788138b86bbbdb107 (diff)
downloadpoky-1bbcc5931e7af670b185e58f897a43109f80a958.tar.gz
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. (From OE-Core rev: 309a02931779f32d1139cc1169a039cbe4638706) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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"