diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-10-01 08:18:01 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-10-10 09:53:32 +0100 |
commit | 36d62753146da6649d1455df9ccb9ffc0140dd5c (patch) | |
tree | 82b540b5501fbdec27b723bbb355d3dd31cb332c /meta/conf/machine | |
parent | 4f2f3c12a9b845de29fc5923d1dccf26eaaa1be2 (diff) | |
download | poky-36d62753146da6649d1455df9ccb9ffc0140dd5c.tar.gz |
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.
(From OE-Core rev: 298fa078fab58b64246376ffd70ad6a0c7589876)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine')
-rw-r--r-- | meta/conf/machine/include/x86/x86-base.inc | 1 | ||||
-rw-r--r-- | meta/conf/machine/qemuarm.conf | 4 | ||||
-rw-r--r-- | meta/conf/machine/qemuarmv5.conf | 1 |
3 files changed, 0 insertions, 6 deletions
diff --git a/meta/conf/machine/include/x86/x86-base.inc b/meta/conf/machine/include/x86/x86-base.inc index 050c20af70..fc6c39148d 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" | |||
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 ??= "6.4%" | ||
22 | 21 | ||
23 | # | 22 | # |
24 | # XSERVER subcomponents, used to build the XSERVER variable | 23 | # XSERVER subcomponents, used to build the XSERVER variable |
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf index 75cfbaf74b..aa9ce88203 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 | |||
29 | QB_SERIAL_OPT = "-device virtio-serial-device -chardev null,id=virtcon -device virtconsole,chardev=virtcon" | 29 | QB_SERIAL_OPT = "-device virtio-serial-device -chardev null,id=virtcon -device virtconsole,chardev=virtcon" |
30 | QB_TCPSERIAL_OPT = "-device virtio-serial-device -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1 -device virtconsole,chardev=virtcon" | 30 | QB_TCPSERIAL_OPT = "-device virtio-serial-device -chardev socket,id=virtcon,port=@PORT@,host=127.0.0.1 -device virtconsole,chardev=virtcon" |
31 | 31 | ||
32 | # 6.4 causes Xorg to fail to read the virtio framebuffer so stick with 6.1 until | ||
33 | # that is resolved. | ||
34 | PREFERRED_VERSION_linux-yocto ??= "6.1%" | ||
35 | |||
36 | KMACHINE:qemuarm = "qemuarma15" | 32 | KMACHINE:qemuarm = "qemuarma15" |
diff --git a/meta/conf/machine/qemuarmv5.conf b/meta/conf/machine/qemuarmv5.conf index deb4869c0a..f0a86f1e4c 100644 --- a/meta/conf/machine/qemuarmv5.conf +++ b/meta/conf/machine/qemuarmv5.conf | |||
@@ -16,5 +16,4 @@ QB_GRAPHICS = "-device virtio-gpu-pci" | |||
16 | QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd" | 16 | QB_OPT_APPEND = "-device qemu-xhci -device usb-tablet -device usb-kbd" |
17 | QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" | 17 | QB_DTB = "${@oe.utils.version_less_or_equal('PREFERRED_VERSION_linux-yocto', '4.7', '', 'zImage-versatile-pb.dtb', d)}" |
18 | 18 | ||
19 | PREFERRED_VERSION_linux-yocto ??= "6.4%" | ||
20 | KMACHINE:qemuarmv5 = "arm-versatile-926ejs" | 19 | KMACHINE:qemuarmv5 = "arm-versatile-926ejs" |