From: Bruce Ashfield Date: Tue, 24 Jan 2023 21:59:47 +0000 (-0500) Subject: conf/qemu: bump preferred kernel version to 6.1 X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~1860 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91c1f7d4eb9ec5ad683c798812395df3a56747ba;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: Alexandre Belloni --- diff --git a/meta/conf/machine/include/x86/x86-base.inc b/meta/conf/machine/include/x86/x86-base.inc index 4052eacdb5b..c3cc0dbff61 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 fe6c0117a88..6e59e42c3ab 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"