From 9cee34458d3c2e4a3bec4859f411b4225012482e Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 13 Jul 2023 20:18:58 +0100 Subject: [PATCH] qemuarm: pin kernel to 6.1 The 6.4 kernel causes parselog failures when Xorg starts: (II) FBDEV(0): checking modes against framebuffer device... (II) FBDEV(0): mode "640x480" test failed (II) FBDEV(0): mode "640x480" test failed (II) FBDEV(0): mode "640x480" test failed (II) FBDEV(0): mode "640x480" test failed (II) FBDEV(0): mode "640x480" not found It appears to be specific to qemuarm without GL. Until this is resolved, pin the qemuarm BSP to 6.1. (From OE-Core rev: 28615ad284243db4465c843c456083c9d4b3a0c4) Signed-off-by: Ross Burton Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/conf/machine/qemuarm.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf index aa9ce88203..75cfbaf74b 100644 --- a/meta/conf/machine/qemuarm.conf +++ b/meta/conf/machine/qemuarm.conf @@ -29,4 +29,8 @@ 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"