From: Antoine Gouby <[email protected]>

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 ${MLPREFIX}mesa-megadriver to correctly handle both mesa-gl builds
(where MLPREFIX is empty) and multilib variants (where it expands to
e.g. "lib32-").

Signed-off-by: Antoine Gouby <[email protected]>
---
Changes in v2:
- Use ${MLPREFIX}mesa-megadriver instead of hardcoded mesa-megadriver
  to also include multilib builds (e.g. lib32-mesa)

v1: 
https://lore.kernel.org/openembedded-core/[email protected]
---
 meta/recipes-graphics/mesa/mesa.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/mesa/mesa.inc 
b/meta/recipes-graphics/mesa/mesa.inc
index 67b740f9e9fb..9c398951b6fc 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:${MLPREFIX}mesa-megadriver += "dev-so"
 
 # OpenCL ICDs package also ship correspondig .so files, there is no -dev 
package
 INSANE_SKIP:libopencl-mesa += "dev-so"

---
base-commit: d595615c6a027b80d6f7ea80ab25e85e97b2436f
change-id: 20260624-mesa-fix-insane-skip-2e54523e22e0

Best regards,
-- 
Antoine Gouby <[email protected]>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#239483): 
https://lists.openembedded.org/g/openembedded-core/message/239483
Mute This Topic: https://lists.openembedded.org/mt/119954405/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to