diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-08-04 18:57:43 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-09 16:37:24 +0100 |
commit | 5ba3b8619de8fefcebe4c7d263fbbd43d049d0ad (patch) | |
tree | fab3807f2417577d423fe4dd74e2d81363003a97 | |
parent | 39d44df6029b4f9f4c9129cec88a4d298b6864ad (diff) | |
download | poky-5ba3b8619de8fefcebe4c7d263fbbd43d049d0ad.tar.gz |
meta/conf: update preferred linux-yocto version to v5.19
v5.19 is the latest reference kernel, we bump our qemu machines
to use it by default.
(From OE-Core rev: 8f3b5cab696704fdc2060c710e3429859736a63a)
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/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 b70924f7d9..4052eacdb5 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" | |||
18 | # kernel-related variables | 18 | # kernel-related variables |
19 | # | 19 | # |
20 | PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" | 20 | PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" |
21 | PREFERRED_VERSION_linux-yocto ??= "5.15%" | 21 | PREFERRED_VERSION_linux-yocto ??= "5.19%" |
22 | 22 | ||
23 | # | 23 | # |
24 | # XSERVER subcomponents, used to build the XSERVER variable | 24 | # XSERVER subcomponents, used to build the XSERVER variable |
diff --git a/meta/conf/machine/qemuarmv5.conf b/meta/conf/machine/qemuarmv5.conf index abdae5f361..fe6c0117a8 100644 --- a/meta/conf/machine/qemuarmv5.conf +++ b/meta/conf/machine/qemuarmv5.conf | |||
@@ -17,5 +17,5 @@ QB_GRAPHICS = "-device virtio-gpu-pci" | |||
17 | QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd" | 17 | QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd" |
18 | QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" | 18 | QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" |
19 | 19 | ||
20 | PREFERRED_VERSION_linux-yocto ??= "5.15%" | 20 | PREFERRED_VERSION_linux-yocto ??= "5.19%" |
21 | KMACHINE:qemuarmv5 = "arm-versatile-926ejs" | 21 | KMACHINE:qemuarmv5 = "arm-versatile-926ejs" |