diff mbox series

mesa: fix INSANE_SKIP package name for mesa-gl builds

Message ID 20260623-mesa-fix-insane-skip-v1-1-97856536ea8b@toradex.com
State Changes Requested
Headers show
Series mesa: fix INSANE_SKIP package name for mesa-gl builds | expand

Commit Message

Antoine Gouby June 23, 2026, 11:21 a.m. UTC
From: Antoine Gouby <antoine.gouby@toradex.com>

mesa.inc is shared by both mesa.bb and mesa-gl.bb. The variable
INSANE_SKIP:${PN}-megadriver expands to mesa-gl-megadriver when
included by mesa-gl.bb, but the package is always named mesa-megadriver
(hardcoded via PACKAGES =+). The skip therefore had no effect for
mesa-gl builds.

This was hidden until mesa 26.1.0 removed the with_gbm condition from
the dril subdir build, causing mesa-gl to now install DRI driver
symlinks into mesa-megadriver for the first time.

Use the hardcoded package name, consistent with the three RREPLACES/
RCONFLICTS/RPROVIDES lines right below.

Signed-off-by: Antoine Gouby <antoine.gouby@toradex.com>
---
 meta/recipes-graphics/mesa/mesa.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


---
base-commit: d595615c6a027b80d6f7ea80ab25e85e97b2436f
change-id: 20260623-mesa-fix-insane-skip-a92277a8dfac

Best regards,

Comments

Mathieu Dubois-Briand June 23, 2026, 2:12 p.m. UTC | #1
On Tue Jun 23, 2026 at 1:21 PM CEST, Antoine Gouby via lists.openembedded.org wrote:
> From: Antoine Gouby <antoine.gouby@toradex.com>
>
> mesa.inc is shared by both mesa.bb and mesa-gl.bb. The variable
> INSANE_SKIP:${PN}-megadriver expands to mesa-gl-megadriver when
> included by mesa-gl.bb, but the package is always named mesa-megadriver
> (hardcoded via PACKAGES =+). The skip therefore had no effect for
> mesa-gl builds.
>
> This was hidden until mesa 26.1.0 removed the with_gbm condition from
> the dril subdir build, causing mesa-gl to now install DRI driver
> symlinks into mesa-megadriver for the first time.
>
> Use the hardcoded package name, consistent with the three RREPLACES/
> RCONFLICTS/RPROVIDES lines right below.
>
> Signed-off-by: Antoine Gouby <antoine.gouby@toradex.com>
> ---

Hi Antoine,

Thanks for your patch.

This is now producing another QA issue about these symlinks, in multilib
configuration:
ERROR: lib32-mesa-2_26.1.2-r0 do_package_qa: QA Issue: non -dev/-dbg/nativesdk- package lib32-mesa-megadriver contains symlink .so '/usr/lib/dri/panel-mipi-dbi_dri.so' [dev-so]
ERROR: lib32-mesa-2_26.1.2-r0 do_package_qa: QA Issue: non -dev/-dbg/nativesdk- package lib32-mesa-megadriver contains symlink .so '/usr/lib/dri/crocus_dri.so' [dev-so]
ERROR: lib32-mesa-2_26.1.2-r0 do_package_qa: QA Issue: non -dev/-dbg/nativesdk- package lib32-mesa-megadriver contains symlink .so '/usr/lib/dri/ili9225_dri.so' [dev-so]
ERROR: lib32-mesa-2_26.1.2-r0 do_package_qa: QA Issue: non -dev/-dbg/nativesdk- package lib32-mesa-megadriver contains symlink .so '/usr/lib/dri/gm12u320_dri.so' [dev-so]
ERROR: lib32-mesa-2_26.1.2-r0 do_package_qa: QA Issue: non -dev/-dbg/nativesdk- package lib32-mesa-megadriver contains symlink .so '/usr/lib/dri/rcar-du_dri.so' [dev-so]

https://autobuilder.yoctoproject.org/valkyrie/#/builders/92/builds/3975

Can you have a look at the issue?

Thanks,
Mathieu
Quentin Schulz June 23, 2026, 2:22 p.m. UTC | #2
On 6/23/26 4:12 PM, Mathieu Dubois-Briand via lists.openembedded.org wrote:
> On Tue Jun 23, 2026 at 1:21 PM CEST, Antoine Gouby via lists.openembedded.org wrote:
>> From: Antoine Gouby <antoine.gouby@toradex.com>
>>
>> mesa.inc is shared by both mesa.bb and mesa-gl.bb. The variable
>> INSANE_SKIP:${PN}-megadriver expands to mesa-gl-megadriver when
>> included by mesa-gl.bb, but the package is always named mesa-megadriver
>> (hardcoded via PACKAGES =+). The skip therefore had no effect for
>> mesa-gl builds.
>>
>> This was hidden until mesa 26.1.0 removed the with_gbm condition from
>> the dril subdir build, causing mesa-gl to now install DRI driver
>> symlinks into mesa-megadriver for the first time.
>>
>> Use the hardcoded package name, consistent with the three RREPLACES/
>> RCONFLICTS/RPROVIDES lines right below.
>>
>> Signed-off-by: Antoine Gouby <antoine.gouby@toradex.com>
>> ---
> 
> Hi Antoine,
> 
> Thanks for your patch.
> 
> This is now producing another QA issue about these symlinks, in multilib
> configuration:
> ERROR: lib32-mesa-2_26.1.2-r0 do_package_qa: QA Issue: non -dev/-dbg/nativesdk- package lib32-mesa-megadriver contains symlink .so '/usr/lib/dri/panel-mipi-dbi_dri.so' [dev-so]
> ERROR: lib32-mesa-2_26.1.2-r0 do_package_qa: QA Issue: non -dev/-dbg/nativesdk- package lib32-mesa-megadriver contains symlink .so '/usr/lib/dri/crocus_dri.so' [dev-so]
> ERROR: lib32-mesa-2_26.1.2-r0 do_package_qa: QA Issue: non -dev/-dbg/nativesdk- package lib32-mesa-megadriver contains symlink .so '/usr/lib/dri/ili9225_dri.so' [dev-so]
> ERROR: lib32-mesa-2_26.1.2-r0 do_package_qa: QA Issue: non -dev/-dbg/nativesdk- package lib32-mesa-megadriver contains symlink .so '/usr/lib/dri/gm12u320_dri.so' [dev-so]
> ERROR: lib32-mesa-2_26.1.2-r0 do_package_qa: QA Issue: non -dev/-dbg/nativesdk- package lib32-mesa-megadriver contains symlink .so '/usr/lib/dri/rcar-du_dri.so' [dev-so]
> 
> https://autobuilder.yoctoproject.org/valkyrie/#/builders/92/builds/3975
> 
> Can you have a look at the issue?
> 

Likely simply

INSANE_SKIP:${MLPREFIX}mesa-megadriver += "dev-so"

?

I'm wondering if we also need something for PACKAGES_DYNAMIC for 
multilib as well (and RREPLACES, RCONFLICTS, RPROVIDES, etc....). I 
really dislike packages which don't use ${PN} in their name, a lot of 
headaches are avoided by simply using ${PN} but I guess that ship has 
sailed already.

Cheers,
Quentin
diff mbox series

Patch

diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 67b740f9e9fb..a3ab4a5f0996 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -347,7 +347,7 @@  FILES:${PN}-tools = "${bindir} ${datadir}"
 ALLOW_EMPTY:${PN}-tools = "1"
 
 # All DRI drivers are symlinks to libdril_dri.so
-INSANE_SKIP:${PN}-megadriver += "dev-so"
+INSANE_SKIP:mesa-megadriver += "dev-so"
 
 # OpenCL ICDs package also ship correspondig .so files, there is no -dev package
 INSANE_SKIP:libopencl-mesa += "dev-so"