From patchwork Thu May 13 14:11:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1478077 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=P647X8Gl; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Fgtrk2sTXz9sW8 for ; Fri, 14 May 2021 00:12:04 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 24305403C8; Thu, 13 May 2021 14:12:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 83iKCF1GG6kA; Thu, 13 May 2021 14:12:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 89F46400D0; Thu, 13 May 2021 14:12:00 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 8B8241BF20D for ; Thu, 13 May 2021 14:11:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 79F2B40F7A for ; Thu, 13 May 2021 14:11:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp4.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 69ubaZJNddhD for ; Thu, 13 May 2021 14:11:57 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by smtp4.osuosl.org (Postfix) with ESMTPS id 6B6CD40F6F for ; Thu, 13 May 2021 14:11:57 +0000 (UTC) Received: by mail-wr1-x431.google.com with SMTP id h4so27011409wrt.12 for ; Thu, 13 May 2021 07:11:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=A/v4o1VAMLoMMX4i7719o7NxxcAMugu2HNXGRog1mSM=; b=P647X8GlR0Vb4YUUMUOFUVtZm0P5gxXX/S8c7prJ3GqJyplTb7XMfjfJaymVCf5WOQ b5OyYf3YpiKgS1ekiXDu+HT2993dnlrCmxV0FwRcRG4KyQJzHfw8zDduSFqVhxighB6L Zr/DxZQ7IWFkkIe7EUJ+EkUt89aJnVGsAbWpCR9fD1a49ypRcoDct1HTY9drLjaQV8YS BVOOYfphflWcmzYqsE/eEkH0S3VHA7nbFkoThPPFQIiDArnWvGkR8/A+HyQfnK3ZdXNY wbgM+vVmVur5Z6H6yP9h3bJPUVElsQsAXTtk2zYDMc6V2WrvMhoDvIUtMPwglNjxdf4G fD0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=A/v4o1VAMLoMMX4i7719o7NxxcAMugu2HNXGRog1mSM=; b=XFkCPNZDPGg3HlWE/TIQLLkVHDgEWzueF44s6CXFA7AwXfmwUt4AyBavrhW7kh5f9j pHK1DgCWROUXuA4blG6a7daa6ypqdOkYR0esjkv4r0+vwl4Ec91GcRRqZf4urCOSo76U xPVG5R07bRQirC8SBh6+GcRYg25H1dnF4CYqYZqlvSGcdVyJwWn9gB3jg7AYVpU7DpgS g9k9M/8cclyCFQxTdVGr+YPEyZgKR2+HwprGVkBNmqk6FbQx72z6pbwNeyzBaJxNHrKb 50TfyubGwhJaz0M550pNBBk1k91ziDqmHuygOO5Ny3hbaVZYSaF0Q32EVfIPckwunsYz IQUg== X-Gm-Message-State: AOAM53067nf+lq3VvX7NfBmUCRezoSnTQMREpCVdi3ftHKL4pVdqVAiP C+RXffWHmNRKFvuFU4kae8sIalvwEUY= X-Google-Smtp-Source: ABdhPJyzIYdFBypGer5ffp3xWKD9HACw89V+jVq7EtgKffXtmZ8wrE+sD9af23c1WA1vWNvyR/OlEw== X-Received: by 2002:a05:6000:12cc:: with SMTP id l12mr14029349wrx.91.1620915115715; Thu, 13 May 2021 07:11:55 -0700 (PDT) Received: from localhost.localdomain (2a01cb058f8a180022164e4eb697b4ce.ipv6.abo.wanadoo.fr. [2a01:cb05:8f8a:1800:2216:4e4e:b697:b4ce]) by smtp.gmail.com with ESMTPSA id a15sm2934344wrr.53.2021.05.13.07.11.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 May 2021 07:11:55 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Thu, 13 May 2021 16:11:48 +0200 Message-Id: <20210513141149.3154510-1-romain.naour@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] support/testing: test_glxinfo: switch to Gallium swrast X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bernd Kuhls , Romain Naour Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Since the mesa3d bump to version 21.0.3 [1], the BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST option is not supported anymore since the mesa DRI swrast driver has been removed upstream So, switch to Gallium swrast. [1]15a2f9b819806d38a7d8172a20f80130b1d60e63 Signed-off-by: Romain Naour Cc: Bernd Kuhls --- support/testing/tests/package/test_glxinfo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_glxinfo.py b/support/testing/tests/package/test_glxinfo.py index f37236d161..44ac92347a 100644 --- a/support/testing/tests/package/test_glxinfo.py +++ b/support/testing/tests/package/test_glxinfo.py @@ -25,7 +25,7 @@ class TestGlxinfo(infra.basetest.BRTest): BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux.config" BR2_PACKAGE_MESA3D_DEMOS=y BR2_PACKAGE_MESA3D=y - BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST=y + BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_OPENGL_GLX=y BR2_PACKAGE_XORG7=y BR2_PACKAGE_XSERVER_XORG_SERVER=y From patchwork Thu May 13 14:11:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1478078 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=tvg/ug2i; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Fgtrz5gq6z9sWP for ; Fri, 14 May 2021 00:12:19 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id D5F1C843C9; Thu, 13 May 2021 14:12:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mpEaLNriBzWR; Thu, 13 May 2021 14:12:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 23F7E84457; Thu, 13 May 2021 14:12:13 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 1151A1BF20D for ; Thu, 13 May 2021 14:11:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 00E8D6065A for ; Thu, 13 May 2021 14:11:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0VL9jIDggRao for ; Thu, 13 May 2021 14:11:58 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by smtp3.osuosl.org (Postfix) with ESMTPS id 197BB60637 for ; Thu, 13 May 2021 14:11:57 +0000 (UTC) Received: by mail-wr1-x42a.google.com with SMTP id a4so27047601wrr.2 for ; Thu, 13 May 2021 07:11:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Yv42Ar2vWc0TCRoellojj3iP3kWJynMc5zJf/uchopA=; b=tvg/ug2i5Fo04zu2Fgs7r+DUSHutRJNCc51ok7Vk6fSD7mul3XL4mpiDG6WrN7rRlb 1L/7b865jIue4uyGSuLvfXVwD3n3i1rif7303QGQf46mwM6pyarIPNWqcUCODNjUelC4 Xfb8nif5seMN9D8lv/C8L9v+bjH5cChfbEDi1UrR3Jun99eMkrXgNOtfEFWIpv2TPTw5 x4lN2pVFxfiVp5JMcwAWaIBJqM0GZwRh+h1L4tHarYkp3vmszvOdY2Jmteu8jFd9IFl3 jgrEPpNv+cSIekx6elaWHUmRgO8BWNi55MqA1YUm9fXhRO9wrmupnV1nWI4onGHbQidM cRVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Yv42Ar2vWc0TCRoellojj3iP3kWJynMc5zJf/uchopA=; b=r789nBJPjNQ1j/EKbXDHc5wmuPLF3nMOmdnQV4nfzDjZt3ePuJ05nUK9HbvOg1nPRs gmYdZ1YYaAkW50+Pwnb2QGuIIKfDiD+cfXDA/5f1jfNP5sotva2RnqVDmJvQGYoqI4tO MK00rKFCqgBxBS5G93r95d/uyue3BmLqE8stKPLCXA47o1rvpIzary+CBpR6EEPL/exG uY1Ss3/LfQQzcEj9U77pdozXaiMEaxRrr/ESKUvqf7SBaw5AnaS91Ir88qPoUj3u82yX HO3wCPSw1iyl6B+d0Wt4MOMpjawYgoT8K2E1U392hF9dVaQYEQMny6pPTEW11UJrt3WX 8ohg== X-Gm-Message-State: AOAM530lggMT9NshQtWsjeTNF/23JUI1+NcJ4maSTsAMCWL0nYb6g9MX Goy9s3o7AXVD/00/jWb+EavoGnwgUq4= X-Google-Smtp-Source: ABdhPJyQ25AfWkFNew3ss1DdNqD55Z36Lc3zvq7VGUiyXrnQ55+q9rz9wciVTkI0+E5tw36gll/17g== X-Received: by 2002:a5d:64ac:: with SMTP id m12mr5325814wrp.158.1620915116413; Thu, 13 May 2021 07:11:56 -0700 (PDT) Received: from localhost.localdomain (2a01cb058f8a180022164e4eb697b4ce.ipv6.abo.wanadoo.fr. [2a01:cb05:8f8a:1800:2216:4e4e:b697:b4ce]) by smtp.gmail.com with ESMTPSA id a15sm2934344wrr.53.2021.05.13.07.11.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 May 2021 07:11:56 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Thu, 13 May 2021 16:11:49 +0200 Message-Id: <20210513141149.3154510-2-romain.naour@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210513141149.3154510-1-romain.naour@gmail.com> References: <20210513141149.3154510-1-romain.naour@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] support/testing: test_glxinfo load X11 modules in the right order X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Romain Naour Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 --- 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