diff options
author | Sakib Sajal <sakib.sajal@windriver.com> | 2020-06-19 14:12:59 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-06-23 12:31:03 +0100 |
commit | a3102471e4e789d77040f5ed0da1b8e438328b5f (patch) | |
tree | 083c7ac42e426047f32ba8de41d0a9b24615593f /scripts/runqemu | |
parent | f5bbb3ba2d65ba7911b7ede5fb32b54b5b904a07 (diff) | |
download | poky-a3102471e4e789d77040f5ed0da1b8e438328b5f.tar.gz |
qemu: uprev v4.2.0 -> v5.0.0
Major update after v4.2.
Changes:
- os_find_datadir() was changed after the v4.2 release
causing v5.0 to not find the bios and not boot the
image. Fix is sent to upstream qemu.
See: qemu/find_datadir.patch
- v5.0 binary had host contamination for dynamically linked
libraries, "--extra-ldflags='${LDFLAGS}'" in EXTRA_OECONF
resolved the issue
- bluetooth code was removed: qemu.git$ git show 1d4ffe8dc7
hence removed PACKAGECONFIG[bluez]
- -show-cursor qemu option is now deprecated, updated
scripts/runqemu to use updated option instead
- added PACKAGECONFIG definitions
- added qemu-ptest to conf/distro/include/ptest-packagelists.inc
- increased support for ARM architecture, cpu and board
- removed patches merged upstream and refreshed
existing ones
Testing:
Build core-image-minimal against the machines in
openembedded-core/meta/conf/machine and succesfully
booted with qemu v5.0
Ran qemu-ptest on x86-64 and arm64 with identical results:
PASS: 1166
SKIP: 0
FAIL: 0
(From OE-Core rev: ee9ec9e344541c1ccd9b9b8e3b8c1e00d008ad85)
Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
Signed-off-by: Joe Slater <joe.slater@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/runqemu')
-rwxr-xr-x | scripts/runqemu | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/runqemu b/scripts/runqemu index 21680b49d2..85f323a712 100755 --- a/scripts/runqemu +++ b/scripts/runqemu | |||
@@ -461,27 +461,27 @@ class BaseConfig(object): | |||
461 | elif arg == 'sdl': | 461 | elif arg == 'sdl': |
462 | if 'gl' in sys.argv[1:]: | 462 | if 'gl' in sys.argv[1:]: |
463 | self.set_dri_path() | 463 | self.set_dri_path() |
464 | self.qemu_opt_script += ' -vga virtio -display sdl,gl=on' | 464 | self.qemu_opt_script += ' -vga virtio -display sdl,gl=on,show-cursor=on' |
465 | elif 'gl-es' in sys.argv[1:]: | 465 | elif 'gl-es' in sys.argv[1:]: |
466 | self.set_dri_path() | 466 | self.set_dri_path() |
467 | self.qemu_opt_script += ' -vga virtio -display sdl,gl=es' | 467 | self.qemu_opt_script += ' -vga virtio -display sdl,gl=es,show-cursor=on' |
468 | else: | 468 | else: |
469 | self.qemu_opt_script += ' -display sdl' | 469 | self.qemu_opt_script += ' -display sdl,show-cursor=on' |
470 | elif arg == 'gtk': | 470 | elif arg == 'gtk': |
471 | if 'gl' in sys.argv[1:]: | 471 | if 'gl' in sys.argv[1:]: |
472 | self.set_dri_path() | 472 | self.set_dri_path() |
473 | self.qemu_opt_script += ' -vga virtio -display gtk,gl=on' | 473 | self.qemu_opt_script += ' -vga virtio -display gtk,gl=on,show-cursor=on' |
474 | elif 'gl-es' in sys.argv[1:]: | 474 | elif 'gl-es' in sys.argv[1:]: |
475 | self.set_dri_path() | 475 | self.set_dri_path() |
476 | self.qemu_opt_script += ' -vga virtio -display gtk,gl=es' | 476 | self.qemu_opt_script += ' -vga virtio -display gtk,gl=es,show-cursor=on' |
477 | else: | 477 | else: |
478 | self.qemu_opt_script += ' -display gtk' | 478 | self.qemu_opt_script += ' -display gtk,show-cursor=on' |
479 | elif arg == 'gl' or arg == 'gl-es': | 479 | elif arg == 'gl' or arg == 'gl-es': |
480 | # These args are handled inside sdl or gtk blocks above | 480 | # These args are handled inside sdl or gtk blocks above |
481 | pass | 481 | pass |
482 | elif arg == 'egl-headless': | 482 | elif arg == 'egl-headless': |
483 | self.set_dri_path() | 483 | self.set_dri_path() |
484 | self.qemu_opt_script += ' -vga virtio -display egl-headless' | 484 | self.qemu_opt_script += ' -vga virtio -display egl-headless,show-cursor=on' |
485 | elif arg == 'serial': | 485 | elif arg == 'serial': |
486 | self.kernel_cmdline_script += ' console=ttyS0' | 486 | self.kernel_cmdline_script += ' console=ttyS0' |
487 | self.serialconsole = True | 487 | self.serialconsole = True |