diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2023-01-24 16:59:47 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-26 22:22:53 +0000 |
commit | 24d0d206336147284c9334596f000cf84058838e (patch) | |
tree | a3394e10a46525a2d5222a08c42347712369f40c /meta/conf/machine | |
parent | 6d31c38c084d149dbed3ab8667646d7214678ab1 (diff) | |
download | poky-24d0d206336147284c9334596f000cf84058838e.tar.gz |
conf/qemu: bump preferred kernel version to 6.1
6.1 has been soaking for a while now, so it is time to bump the
default qemu version to 6.1 and prepare to remove 5.19.
(From OE-Core rev: 91c1f7d4eb9ec5ad683c798812395df3a56747ba)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine')
-rw-r--r-- | meta/conf/machine/include/x86/x86-base.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/qemuarmv5.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/machine/include/x86/x86-base.inc b/meta/conf/machine/include/x86/x86-base.inc index 4052eacdb5..c3cc0dbff6 100644 --- a/meta/conf/machine/include/x86/x86-base.inc +++ b/meta/conf/machine/include/x86/x86-base.inc | |||
@@ -18,7 +18,7 @@ SERIAL_CONSOLES ?= "115200;ttyS0" | |||
18 | # kernel-related variables | 18 | # kernel-related variables |
19 | # | 19 | # |
20 | PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" | 20 | PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" |
21 | PREFERRED_VERSION_linux-yocto ??= "5.19%" | 21 | PREFERRED_VERSION_linux-yocto ??= "6.1%" |
22 | 22 | ||
23 | # | 23 | # |
24 | # XSERVER subcomponents, used to build the XSERVER variable | 24 | # XSERVER subcomponents, used to build the XSERVER variable |
diff --git a/meta/conf/machine/qemuarmv5.conf b/meta/conf/machine/qemuarmv5.conf index fe6c0117a8..6e59e42c3a 100644 --- a/meta/conf/machine/qemuarmv5.conf +++ b/meta/conf/machine/qemuarmv5.conf | |||
@@ -17,5 +17,5 @@ QB_GRAPHICS = "-device virtio-gpu-pci" | |||
17 | QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd" | 17 | QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd" |
18 | QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" | 18 | QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" |
19 | 19 | ||
20 | PREFERRED_VERSION_linux-yocto ??= "5.19%" | 20 | PREFERRED_VERSION_linux-yocto ??= "6.1%" |
21 | KMACHINE:qemuarmv5 = "arm-versatile-926ejs" | 21 | KMACHINE:qemuarmv5 = "arm-versatile-926ejs" |