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:37 +0000 |
commit | 91c1f7d4eb9ec5ad683c798812395df3a56747ba (patch) | |
tree | b8ce308cf0c2760aa04cf15f384cb60254620bc3 /meta | |
parent | 14a81556ff1be326647e654424c8f1bf9d0db912 (diff) | |
download | openembedded-core-contrib-91c1f7d4eb9ec5ad683c798812395df3a56747ba.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.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Diffstat (limited to 'meta')
-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" # kernel-related variables # PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" -PREFERRED_VERSION_linux-yocto ??= "5.19%" +PREFERRED_VERSION_linux-yocto ??= "6.1%" # # 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" QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd" QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" -PREFERRED_VERSION_linux-yocto ??= "5.19%" +PREFERRED_VERSION_linux-yocto ??= "6.1%" KMACHINE:qemuarmv5 = "arm-versatile-926ejs" |