diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-20 10:30:24 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-21 00:16:49 +0100 |
| commit | 309a02931779f32d1139cc1169a039cbe4638706 (patch) | |
| tree | 1b214c7c130d54112771fbc4c31e8e9a1d7dafcc /meta | |
| parent | 5da1b9c29afc249d5ff7e9514bf996227dc28c7a (diff) | |
| download | openembedded-core-309a02931779f32d1139cc1169a039cbe4638706.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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/testimage.bbclass | 2 | ||||
| -rw-r--r-- | meta/conf/bitbake.conf | 2 |
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 () { 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 c4dba61cc6..44ec869a16 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)) 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" |