diff mbox series

[2/2] support/testing: test_glxinfo load X11 modules in the right order

Message ID 20210513141149.3154510-2-romain.naour@gmail.com
State Accepted
Headers show
Series [1/2] support/testing: test_glxinfo: switch to Gallium swrast | expand

Commit Message

Romain Naour May 13, 2021, 2:11 p.m. UTC 
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 <romain.naour@gmail.com>
---
 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

Comments

Yann E. MORIN May 18, 2021, 1:26 p.m. UTC | #1 
Romain, All,

On 2021-05-13 16:11 +0200, Romain Naour spake thusly:
> 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 <romain.naour@gmail.com>

Applied to master, thanks.

Regards,
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.31.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Peter Korsgaard May 20, 2021, 9:18 a.m. UTC | #2 
>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:

 > 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 <romain.naour@gmail.com>

Is this also applicable to 2021.02.x, E.G. where we use the older swrast
driver?
Romain Naour May 20, 2021, 10:15 a.m. UTC | #3 
Hello Peter,

Le 20/05/2021 à 11:18, Peter Korsgaard a écrit :
>>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:
> 
>  > 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 <romain.naour@gmail.com>
> 
> Is this also applicable to 2021.02.x, E.G. where we use the older swrast
> driver?
> 

This patch is needed after the switch to the gallium swrast.
Since the test_glxinfo was working for the 2021.02 release the backport is not
needed.

Best regards,
Romain
Peter Korsgaard May 20, 2021, 10:59 a.m. UTC | #4 
>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:

Hi,

 >> > Fixes:
 >> > https://gitlab.com/buildroot.org/buildroot/-/jobs/1255661899
 >> 
 >> > [1] https://forums.gentoo.org/viewtopic-p-8245578.html#8245578
 >> 
 >> > Signed-off-by: Romain Naour <romain.naour@gmail.com>
 >> 
 >> Is this also applicable to 2021.02.x, E.G. where we use the older swrast
 >> driver?

 > This patch is needed after the switch to the gallium swrast.
 > Since the test_glxinfo was working for the 2021.02 release the backport is not
 > needed.

Ok, thanks!
diff mbox series

Patch

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