From a7ebb5053a5dd7d0989a15cc4dee7116d3ef0948 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Sun, 15 Aug 2021 11:08:58 -0400 Subject: conf/machine: bump qemu preferred versions to 5.13 5.13 is the latest reference kernel, so let's make it the default. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/conf/machine/include/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-base.inc b/meta/conf/machine/include/x86-base.inc index ef6690b0b9..958b3490e8 100644 --- a/meta/conf/machine/include/x86-base.inc +++ b/meta/conf/machine/include/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.10%" +PREFERRED_VERSION_linux-yocto ??= "5.13%" # # XSERVER subcomponents, used to build the XSERVER variable diff --git a/meta/conf/machine/qemuarmv5.conf b/meta/conf/machine/qemuarmv5.conf index 7650c2f4a2..b0dc1022fa 100644 --- a/meta/conf/machine/qemuarmv5.conf +++ b/meta/conf/machine/qemuarmv5.conf @@ -14,7 +14,7 @@ QB_SYSTEM_NAME = "qemu-system-arm" QB_MACHINE = "-machine versatilepb" QB_KERNEL_CMDLINE_APPEND = "vmalloc=256" QB_OPT_APPEND = "-usb -device usb-tablet" -PREFERRED_VERSION_linux-yocto ??= "5.10%" +PREFERRED_VERSION_linux-yocto ??= "5.13%" QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" KMACHINE:qemuarmv5 = "qemuarm" -- cgit 1.2.3-korg