diff options
| author |   Bruce Ashfield <bruce.ashfield@gmail.com> | 2021-09-22 13:53:52 -0400 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-24 10:14:46 +0100 |
| commit | af19c44c4af68568de2ddb5c11d8ad34ac600522 (patch) | |
| tree | dd7c4c74e38955fdf933b04a2cd1845a0bce8ec2 /meta/conf | |
| parent | aa27c2e7570f229bf82f18cf07aae93ba96ca9f6 (diff) | |
| download | openembedded-core-contrib-af19c44c4af68568de2ddb5c11d8ad34ac600522.tar.gz | |
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 <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | meta/conf/machine/include/x86/x86-base.inc | 2 | ||||
| -rw-r--r-- | 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 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" |