From 4a3639bad01a08b7bbb4ccb3090099a01799f321 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 13 May 2021 16:11:49 +0200 Subject: [PATCH] support/testing: test_glxinfo load X11 modules in the right order From [1] "Xorg does not implement real dynamic linking and requires that its modules get loaded in the right order." From /var/log/Xorg.0.0.log: (II) LoadModule: "modesetting" (II) Loading /usr/lib/xorg/modules/drivers/modesetting_drv.so (EE) Failed to load /usr/lib/xorg/modules/drivers/modesetting_drv.so: /usr/lib/xorg/modules/drivers/modesetting_drv.so: undefined symbol: shadowRemove Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1255661899 [1] https://forums.gentoo.org/viewtopic-p-8245578.html#8245578 Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- support/testing/tests/package/test_glxinfo.py | 4 +++- .../etc/X11/xorg.conf.d/01-modules.conf | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 support/testing/tests/package/test_glxinfo/rootfs-overlay/etc/X11/xorg.conf.d/01-modules.conf diff --git a/support/testing/tests/package/test_glxinfo.py b/support/testing/tests/package/test_glxinfo.py index 44ac92347a..3417e48612 100644 --- a/support/testing/tests/package/test_glxinfo.py +++ b/support/testing/tests/package/test_glxinfo.py @@ -32,7 +32,9 @@ class TestGlxinfo(infra.basetest.BRTest): BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_ROOTFS_EXT2=y # BR2_TARGET_ROOTFS_TAR is not set - """ + BR2_ROOTFS_OVERLAY="{}" + """.format( + infra.filepath("tests/package/test_glxinfo/rootfs-overlay")) def wait_for_xserver(self): # xserver takes some time to start up diff --git a/support/testing/tests/package/test_glxinfo/rootfs-overlay/etc/X11/xorg.conf.d/01-modules.conf b/support/testing/tests/package/test_glxinfo/rootfs-overlay/etc/X11/xorg.conf.d/01-modules.conf new file mode 100644 index 0000000000..c693c213f5 --- /dev/null +++ b/support/testing/tests/package/test_glxinfo/rootfs-overlay/etc/X11/xorg.conf.d/01-modules.conf @@ -0,0 +1,11 @@ + +# Xorg does not implement real dynamic linking and requires that its +# modules get loaded in the right order. +# https://forums.gentoo.org/viewtopic-p-8245578.html#8245578 +Section "Module" + Load "vgahw" + Load "fb" + Load "shadowfb" + Load "shadow" + Load "glamoregl" +EndSection -- 2.30.2