1 files changed, 12 insertions, 1 deletions

diff --git a/recipes-graphics/piglit/piglit_%.bbappend b/recipes-graphics/piglit/piglit_%.bbappend
index 56671a326..0646860a4 100644
--- a/recipes-graphics/piglit/piglit_%.bbappend
+++ b/recipes-graphics/piglit/piglit_%.bbappend
@@ -8,6 +8,11 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 # General build fixes (cl test include dirs, GCC memory-flag error).
+#
+# Deliberately unscoped and NOT suppressed: this really does patch piglit on
+# every machine, so the finding is correct. Scoping it would break non-i.MX
+# builds that currently succeed only because these fix genuine upstream
+# errors. The real fix is to send both patches to openembedded-core.
 SRC_URI += "file://0001-tests-Fix-cl-test-Include-Directories-error-Error-0-.patch \
             file://0002-cl-Add-mutually-exclusive-memory-flags-for-CL_MEM_KE.patch"
 
@@ -17,7 +22,13 @@ PACKAGECONFIG:append = " ${PACKAGECONFIG_APPEND}"
 # nooelint: oelint.vars.noncoreoverride
 PACKAGECONFIG:remove = "${PACKAGECONFIG_REMOVE}"
 
-PACKAGECONFIG_APPEND ?= "\
+# The gbm/vulkan default is scoped to imx-generic-bsp. Unscoped it applied to
+# every machine in the build, which pulled virtual/libgbm, glslang-native and
+# vulkan-loader into piglit's DEPENDS and flipped PIGLIT_BUILD_VK_TESTS on for
+# machines this layer does not own. The mx6/mx7 clears below still win over
+# this because their overrides come later in OVERRIDES.
+PACKAGECONFIG_APPEND ?= ""
+PACKAGECONFIG_APPEND:imx-generic-bsp ?= "\
     gbm \
     ${@bb.utils.filter('DISTRO_FEATURES', 'vulkan', d)}"
 PACKAGECONFIG_APPEND:append:imxviv:mx8-nxp-bsp = " opencl"