mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-20 08:29:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

qemux86/qemuarm: Drop kernel version overrides

Browse Source 
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.

(From OE-Core rev: 298fa078fab58b64246376ffd70ad6a0c7589876)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2023-10-01 08:18:01 +01:00
parent 4f2f3c12a9
commit 36d6275314
3 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
meta/conf/machine/include/x86/x86-base.inc
View File

@@ -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

4
meta/conf/machine/qemuarm.conf
View File

@@ -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"

1
meta/conf/machine/qemuarmv5.conf
View File

@@ -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"