aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2021-08-15 11:08:58 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-17 09:53:06 +0100
commita7ebb5053a5dd7d0989a15cc4dee7116d3ef0948 (patch)
treed5eb044d298f811c0b1830b57e8947ecf2d467eb
parentf4ff7a501df84f15900652703349c0072ef8714c (diff)
downloadopenembedded-core-contrib-a7ebb5053a5dd7d0989a15cc4dee7116d3ef0948.tar.gz
openembedded-core-contrib-a7ebb5053a5dd7d0989a15cc4dee7116d3ef0948.tar.bz2
openembedded-core-contrib-a7ebb5053a5dd7d0989a15cc4dee7116d3ef0948.zip
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 <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/machine/include/x86-base.inc2
-rw-r--r--meta/conf/machine/qemuarmv5.conf2
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 ef6690b0b98..958b3490e84 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 7650c2f4a2c..b0dc1022fab 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"