diff options
author | Konrad Weihmann <kweihmann@outlook.com> | 2020-04-14 21:19:14 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-07-02 16:12:36 +0100 |
commit | 21b666b47b95f2962921243ee054b77f37bffb23 (patch) | |
tree | 460e2990fbb04746eec3f97f5cc1f5199eb574ad /meta/classes | |
parent | 81c46e46a8f3db9659fef58d6bd1ce0e45f4ff95 (diff) | |
download | poky-21b666b47b95f2962921243ee054b77f37bffb23.tar.gz |
testimage: enable ovmf support
Add support for running wic images with EFI as testimage.
Introduces a variable called QEMU_USE_OVMF for configuration.
(From OE-Core rev: 458a860b45c0fb5bb3162b5a112b518c3339c1dd)
Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 3af8aaff68ed332d812ea7dc184d392700ad7882)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/testimage.bbclass | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index deb81bc256..53945478af 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass | |||
@@ -275,11 +275,14 @@ def testimage_main(d): | |||
275 | # Get use_kvm | 275 | # Get use_kvm |
276 | kvm = oe.types.qemu_use_kvm(d.getVar('QEMU_USE_KVM'), d.getVar('TARGET_ARCH')) | 276 | kvm = oe.types.qemu_use_kvm(d.getVar('QEMU_USE_KVM'), d.getVar('TARGET_ARCH')) |
277 | 277 | ||
278 | # Get OVMF | ||
279 | ovmf = d.getVar("QEMU_USE_OVMF") | ||
280 | |||
278 | slirp = False | 281 | slirp = False |
279 | if d.getVar("QEMU_USE_SLIRP"): | 282 | if d.getVar("QEMU_USE_SLIRP"): |
280 | slirp = True | 283 | slirp = True |
281 | 284 | ||
282 | # TODO: We use the current implementatin of qemu runner because of | 285 | # TODO: We use the current implementation of qemu runner because of |
283 | # time constrains, qemu runner really needs a refactor too. | 286 | # time constrains, qemu runner really needs a refactor too. |
284 | target_kwargs = { 'machine' : machine, | 287 | target_kwargs = { 'machine' : machine, |
285 | 'rootfs' : rootfs, | 288 | 'rootfs' : rootfs, |
@@ -293,6 +296,7 @@ def testimage_main(d): | |||
293 | 'slirp' : slirp, | 296 | 'slirp' : slirp, |
294 | 'dump_dir' : d.getVar("TESTIMAGE_DUMP_DIR"), | 297 | 'dump_dir' : d.getVar("TESTIMAGE_DUMP_DIR"), |
295 | 'serial_ports': len(d.getVar("SERIAL_CONSOLES").split()), | 298 | 'serial_ports': len(d.getVar("SERIAL_CONSOLES").split()), |
299 | 'ovmf' : ovmf, | ||
296 | } | 300 | } |
297 | 301 | ||
298 | if d.getVar("TESTIMAGE_BOOT_PATTERNS"): | 302 | if d.getVar("TESTIMAGE_BOOT_PATTERNS"): |