From 51c1d248053be1b1031bd61a5983e14e95b62930 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 11 Jan 2022 12:59:58 -0500 Subject: conf/machine: bump qemu preferred versions to 5.15 5.14 has been removed from the active kernel list, so we make 5.15 the new default. (From OE-Core rev: 24fb6a22332f746e3bef89ff8e5719838f0ed8b5) Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/conf/machine/include/x86/x86-base.inc | 2 +- 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 44e4b4ec46..e76251ea2b 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.14%" +PREFERRED_VERSION_linux-yocto ??= "5.15%" # # XSERVER subcomponents, used to build the XSERVER variable diff --git a/meta/conf/machine/qemuarmv5.conf b/meta/conf/machine/qemuarmv5.conf index 3c2c4997b9..2dad504c99 100644 --- a/meta/conf/machine/qemuarmv5.conf +++ b/meta/conf/machine/qemuarmv5.conf @@ -15,7 +15,7 @@ QB_MACHINE = "-machine versatilepb" QB_KERNEL_CMDLINE_APPEND = "vmalloc=256" QB_GRAPHICS = "-device virtio-gpu-pci" QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd" -PREFERRED_VERSION_linux-yocto ??= "5.14%" +PREFERRED_VERSION_linux-yocto ??= "5.15%" QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" KMACHINE:qemuarmv5 = "qemuarm" -- cgit v1.2.3-54-g00ecf