From: Bruce Ashfield Date: Wed, 22 Sep 2021 17:53:52 +0000 (-0400) Subject: conf/machine: bump qemu preferred versions to 5.14 X-Git-Tag: yocto-3.4~74 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=af19c44c4af68568de2ddb5c11d8ad34ac600522;p=openembedded-core.git conf/machine: bump qemu preferred versions to 5.14 5.14 is the latest reference kernel, so let's make it the default. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- diff --git a/meta/conf/machine/include/x86/x86-base.inc b/meta/conf/machine/include/x86/x86-base.inc index 958b3490e8..44e4b4ec46 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.13%" +PREFERRED_VERSION_linux-yocto ??= "5.14%" # # XSERVER subcomponents, used to build the XSERVER variable diff --git a/meta/conf/machine/qemuarmv5.conf b/meta/conf/machine/qemuarmv5.conf index 252d6286d8..3c2c4997b9 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.13%" +PREFERRED_VERSION_linux-yocto ??= "5.14%" QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" KMACHINE:qemuarmv5 = "qemuarm"