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 /meta/conf/machine | |
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 'meta/conf/machine')
-rw-r--r-- | meta/conf/machine/include/qemuboot-mips.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/qemuboot-x86.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/qemuarm.conf | 2 | ||||
-rw-r--r-- | meta/conf/machine/qemuarm64.conf | 2 | ||||
-rw-r--r-- | meta/conf/machine/qemuarmv5.conf | 2 | ||||
-rw-r--r-- | meta/conf/machine/qemuppc.conf | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/meta/conf/machine/include/qemuboot-mips.inc b/meta/conf/machine/include/qemuboot-mips.inc index f1f7c2ae20..e99bade2e3 100644 --- a/meta/conf/machine/include/qemuboot-mips.inc +++ b/meta/conf/machine/include/qemuboot-mips.inc | |||
@@ -2,7 +2,7 @@ | |||
2 | IMAGE_CLASSES += "qemuboot" | 2 | IMAGE_CLASSES += "qemuboot" |
3 | QB_MACHINE = "-machine malta" | 3 | QB_MACHINE = "-machine malta" |
4 | QB_KERNEL_CMDLINE_APPEND = "console=ttyS0 console=tty" | 4 | QB_KERNEL_CMDLINE_APPEND = "console=ttyS0 console=tty" |
5 | QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" | 5 | QB_OPT_APPEND = "-usb -device usb-tablet" |
6 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy | 6 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy |
7 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" | 7 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" |
8 | 8 | ||
diff --git a/meta/conf/machine/include/qemuboot-x86.inc b/meta/conf/machine/include/qemuboot-x86.inc index 5dcc8b6f6b..ccc6dcd3bf 100644 --- a/meta/conf/machine/include/qemuboot-x86.inc +++ b/meta/conf/machine/include/qemuboot-x86.inc | |||
@@ -9,7 +9,7 @@ QB_CPU_KVM_x86-64 = "-cpu core2duo" | |||
9 | QB_AUDIO_DRV = "alsa" | 9 | QB_AUDIO_DRV = "alsa" |
10 | QB_AUDIO_OPT = "-soundhw ac97,es1370" | 10 | QB_AUDIO_OPT = "-soundhw ac97,es1370" |
11 | QB_KERNEL_CMDLINE_APPEND = "oprofile.timer=1" | 11 | QB_KERNEL_CMDLINE_APPEND = "oprofile.timer=1" |
12 | QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" | 12 | QB_OPT_APPEND = "-usb -device usb-tablet" |
13 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy | 13 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy |
14 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" | 14 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" |
15 | 15 | ||
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf index 4e605d3a92..44e73a3070 100644 --- a/meta/conf/machine/qemuarm.conf +++ b/meta/conf/machine/qemuarm.conf | |||
@@ -17,7 +17,7 @@ QB_CPU = "-cpu cortex-a15" | |||
17 | # Standard Serial console | 17 | # Standard Serial console |
18 | QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0" | 18 | QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0" |
19 | # For graphics to work we need to define the VGA device as well as the necessary USB devices | 19 | # For graphics to work we need to define the VGA device as well as the necessary USB devices |
20 | QB_OPT_APPEND = "-show-cursor -device VGA,edid=on" | 20 | QB_OPT_APPEND = "-device VGA,edid=on" |
21 | QB_OPT_APPEND += "-device qemu-xhci -device usb-tablet -device usb-kbd" | 21 | QB_OPT_APPEND += "-device qemu-xhci -device usb-tablet -device usb-kbd" |
22 | # Add the virtio RNG | 22 | # Add the virtio RNG |
23 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" | 23 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" |
diff --git a/meta/conf/machine/qemuarm64.conf b/meta/conf/machine/qemuarm64.conf index e8aac38475..d0d6f38e42 100644 --- a/meta/conf/machine/qemuarm64.conf +++ b/meta/conf/machine/qemuarm64.conf | |||
@@ -18,7 +18,7 @@ QB_CPU_KVM = "-cpu host -machine gic-version=3" | |||
18 | # Standard Serial console | 18 | # Standard Serial console |
19 | QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0" | 19 | QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0" |
20 | # For graphics to work we need to define the VGA device as well as the necessary USB devices | 20 | # For graphics to work we need to define the VGA device as well as the necessary USB devices |
21 | QB_OPT_APPEND = "-show-cursor -device VGA,edid=on" | 21 | QB_OPT_APPEND = "-device VGA,edid=on" |
22 | QB_OPT_APPEND += "-device qemu-xhci -device usb-tablet -device usb-kbd" | 22 | QB_OPT_APPEND += "-device qemu-xhci -device usb-tablet -device usb-kbd" |
23 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy | 23 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy |
24 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" | 24 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" |
diff --git a/meta/conf/machine/qemuarmv5.conf b/meta/conf/machine/qemuarmv5.conf index e7f24fe1ea..6940efe46f 100644 --- a/meta/conf/machine/qemuarmv5.conf +++ b/meta/conf/machine/qemuarmv5.conf | |||
@@ -13,7 +13,7 @@ SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;ttyAMA1" | |||
13 | QB_SYSTEM_NAME = "qemu-system-arm" | 13 | QB_SYSTEM_NAME = "qemu-system-arm" |
14 | QB_MACHINE = "-machine versatilepb" | 14 | QB_MACHINE = "-machine versatilepb" |
15 | QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty" | 15 | QB_KERNEL_CMDLINE_APPEND = "console=ttyAMA0,115200 console=tty" |
16 | QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" | 16 | QB_OPT_APPEND = "-usb -device usb-tablet" |
17 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy | 17 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy |
18 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" | 18 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" |
19 | PREFERRED_VERSION_linux-yocto ??= "5.4%" | 19 | PREFERRED_VERSION_linux-yocto ??= "5.4%" |
diff --git a/meta/conf/machine/qemuppc.conf b/meta/conf/machine/qemuppc.conf index bd88eeb12a..9733b5e85b 100644 --- a/meta/conf/machine/qemuppc.conf +++ b/meta/conf/machine/qemuppc.conf | |||
@@ -16,7 +16,7 @@ QB_SYSTEM_NAME = "qemu-system-ppc" | |||
16 | QB_MACHINE = "-machine mac99" | 16 | QB_MACHINE = "-machine mac99" |
17 | QB_CPU = "-cpu G4" | 17 | QB_CPU = "-cpu G4" |
18 | QB_KERNEL_CMDLINE_APPEND = "console=tty console=ttyS0" | 18 | QB_KERNEL_CMDLINE_APPEND = "console=tty console=ttyS0" |
19 | QB_OPT_APPEND = "-show-cursor -usb -device usb-tablet" | 19 | QB_OPT_APPEND = "-usb -device usb-tablet" |
20 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy | 20 | # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy |
21 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" | 21 | QB_OPT_APPEND += "-object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0" |
22 | QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" | 22 | QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no" |