From 298fa078fab58b64246376ffd70ad6a0c7589876 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 1 Oct 2023 08:18:01 +0100 Subject: [PATCH] qemux86/qemuarm: Drop kernel version overrides Drop the version overrides for the kernel for the x86 and arm machines so we can go back to following the distro versions. The reasons for these versions is mostly historical at this point as the issues were resolved. Signed-off-by: Richard Purdie --- meta/conf/machine/include/x86/x86-base.inc | 1 - meta/conf/machine/qemuarm.conf | 4 ---- meta/conf/machine/qemuarmv5.conf | 1 - 3 files changed, 6 deletions(-) diff --git a/meta/conf/machine/include/x86/x86-base.inc b/meta/conf/machine/include/x86/x86-base.inc index 050c20af70c..fc6c39148db 100644 --- a/meta/conf/machine/include/x86/x86-base.inc +++ b/meta/conf/machine/include/x86/x86-base.inc @@ -18,7 +18,6 @@ SERIAL_CONSOLES ?= "115200;ttyS0" # kernel-related variables # PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" -PREFERRED_VERSION_linux-yocto ??= "6.4%" # # XSERVER subcomponents, used to build the XSERVER variable diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf index 75cfbaf74b6..aa9ce882035 100644 --- a/meta/conf/machine/qemuarm.conf +++ b/meta/conf/machine/qemuarm.conf @@ -29,8 +29,4 @@ QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio QB_SERIAL_OPT = "-device virtio-serial-device -chardev null,id=virtcon -device virtconsole,chardev=virtcon" QB_TCPSERIAL_OPT = "-device virtio-serial-device -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1 -device virtconsole,chardev=virtcon" -# 6.4 causes Xorg to fail to read the virtio framebuffer so stick with 6.1 until -# that is resolved. -PREFERRED_VERSION_linux-yocto ??= "6.1%" - KMACHINE:qemuarm = "qemuarma15" diff --git a/meta/conf/machine/qemuarmv5.conf b/meta/conf/machine/qemuarmv5.conf index deb4869c0aa..f0a86f1e4c7 100644 --- a/meta/conf/machine/qemuarmv5.conf +++ b/meta/conf/machine/qemuarmv5.conf @@ -16,5 +16,4 @@ QB_GRAPHICS = "-device virtio-gpu-pci" QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd" QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" -PREFERRED_VERSION_linux-yocto ??= "6.4%" KMACHINE:qemuarmv5 = "arm-versatile-926ejs" -- 2.47.2