8 files changed, 22 insertions, 38 deletions

diff --git a/classes/qoriq_build_64bit_kernel.bbclass b/classes/qoriq_build_64bit_kernel.bbclass
index 8a6a7cd41..f13aac973 100644
--- a/classes/qoriq_build_64bit_kernel.bbclass
+++ b/classes/qoriq_build_64bit_kernel.bbclass
@@ -1,10 +1,9 @@
 inherit features_check
 REQUIRED_DISTRO_FEATURES:e6500 += "multiarch"
 
-# oelint.vars.noncoreoverride fires on the anonymous python below and is not
-# suppressed: oelint anchors it to the preceding line, so a directive there
-# only moves the anchor onto itself. This is a bbclass, so it affects only
-# recipes that inherit it, and the body is inert unless BUILD_64BIT_KERNEL is "1".
+# BUILD_64BIT_KERNEL is this class's interface, not a machine override: any
+# machine that sets it gets the promotion, and in-tree only e6500.inc does.
+# nooelint: oelint.vars.noncoreoverride
 python () {
     promote_kernel = d.getVar('BUILD_64BIT_KERNEL', False)
     if promote_kernel == "1":
diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/bluealsa/bluealsa_%.bbappend b/dynamic-layers/multimedia-layer/recipes-multimedia/bluealsa/bluealsa_%.bbappend
index 212dd3b7a..3b71fb194 100644
--- a/dynamic-layers/multimedia-layer/recipes-multimedia/bluealsa/bluealsa_%.bbappend
+++ b/dynamic-layers/multimedia-layer/recipes-multimedia/bluealsa/bluealsa_%.bbappend
@@ -1 +1,3 @@
-SYSTEMD_AUTO_ENABLE:${PN} = "disable"
+# The i.MX BSP uses pipewire for Bluetooth audio, so bluealsa's own service is
+# redundant here.
+SYSTEMD_AUTO_ENABLE:${PN}:imx-generic-bsp = "disable"
diff --git a/dynamic-layers/multimedia-layer/recipes-multimedia/wireplumber/wireplumber_%.bbappend b/dynamic-layers/multimedia-layer/recipes-multimedia/wireplumber/wireplumber_%.bbappend
index f1c301b05..899751915 100644
--- a/dynamic-layers/multimedia-layer/recipes-multimedia/wireplumber/wireplumber_%.bbappend
+++ b/dynamic-layers/multimedia-layer/recipes-multimedia/wireplumber/wireplumber_%.bbappend
@@ -19,4 +19,3 @@ do_install:append:imx-nxp-bsp () {
     install -m 0644 ${UNPACKDIR}/80-disable-logind.conf ${D}${datadir}/wireplumber/wireplumber.conf.d
 }
 
-FILES:${PN}:append = " ${datadir}/wireplumber/wireplumber.conf.d"
diff --git a/dynamic-layers/openembedded-layer/recipes-graphics/glm/glm_%.bbappend b/dynamic-layers/openembedded-layer/recipes-graphics/glm/glm_%.bbappend
index 88a16cb9d..f66b1b77e 100644
--- a/dynamic-layers/openembedded-layer/recipes-graphics/glm/glm_%.bbappend
+++ b/dynamic-layers/openembedded-layer/recipes-graphics/glm/glm_%.bbappend
@@ -1,2 +1,3 @@
-# This is a header-only library, so the main package will be empty.
-ALLOW_EMPTY:${PN} = "1"
+# Header-only library, so the main package is empty. imx-gpu-sdk RDEPENDS on it
+# to pull the headers into the SDK, and only builds on imxgpu machines.
+ALLOW_EMPTY:${PN}:imxgpu = "1"
diff --git a/dynamic-layers/openembedded-layer/recipes-support/sg3-utils/sg3-utils_%.bbappend b/dynamic-layers/openembedded-layer/recipes-support/sg3-utils/sg3-utils_%.bbappend
index 608377e33..cad2306f9 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/sg3-utils/sg3-utils_%.bbappend
+++ b/dynamic-layers/openembedded-layer/recipes-support/sg3-utils/sg3-utils_%.bbappend
@@ -1 +1,4 @@
-BBCLASSEXTEND = "native nativesdk"
+# utp-com, this layer's i.MX flashing tool, is BBCLASSEXTEND'd and DEPENDS on
+# sg3-utils, so the variants must exist on the machines we provide.
+BBCLASSEXTEND:imx-generic-bsp = "native nativesdk"
+BBCLASSEXTEND:qoriq = "native nativesdk"
diff --git a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc
index 17e06aae9..6bf110c57 100644
--- a/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc
+++ b/dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc
@@ -6,21 +6,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/qt4:"
 
 DEPENDS:append:imxgpu2d = " virtual/kernel virtual/libgles2"
 
-# Kernel shared-workdir dependency is only needed on mx6; keep it as an
-# anonymous python guard on MACHINEOVERRIDES families.
-# oelint.vars.noncoreoverride also fires here and is not suppressed: for an
-# anonymous python block oelint anchors the finding to the preceding line, so a
-# directive there only moves the anchor onto itself. The handler tests
-# MACHINEOVERRIDES for the mx6 family first, so it is a no-op elsewhere.
-# nooelint: oelint.task.noanonpython
-python __anonymous () {
-    families = ['mx6']
-    cur_families = (d.getVar('MACHINEOVERRIDES') or '').split(':')
-    if any(map(lambda x: x in cur_families,
-               families)):
-        d.appendVarFlag('do_configure', 'depends', ' virtual/kernel:do_shared_workdir')
-}
-
 SRC_URI:append:imxgpu2d = " \
     file://0001-Add-support-for-i.MX-codecs-to-phonon.patch \
     file://0002-i.MX-video-renderer-Allow-v4l-device-from-environmen.patch \
diff --git a/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend b/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend
index 495d641cf..7cc6cb9c1 100644
--- a/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend
+++ b/dynamic-layers/qt6-layer/recipes-qt/qt6/qtbase_%.bbappend
@@ -56,9 +56,12 @@ PACKAGECONFIG_PLATFORM_EGLFS:mx8-nxp-bsp = "\
 PACKAGECONFIG_PLATFORM:use-mainline-bsp = "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'eglfs', d)}"
 
-PACKAGECONFIG += "\
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '${PACKAGECONFIG_WAYLAND}', '', d)}"
-PACKAGECONFIG_WAYLAND = "wayland"
+# meta-qt6 carries the wayland knob in PACKAGECONFIG_GRAPHICS, which the machine
+# assignments above replace. Restore it on the machines this layer provides.
+PACKAGECONFIG:append:imx-generic-bsp = "\
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}"
+PACKAGECONFIG:append:qoriq = "\
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}"
 
 # No-op off-target: the helper it consumes expands empty.
 # nooelint: oelint.vars.noncoreoverride
diff --git a/recipes-graphics/piglit/piglit_%.bbappend b/recipes-graphics/piglit/piglit_%.bbappend
index 9a68b6f8f..8da9344b0 100644
--- a/recipes-graphics/piglit/piglit_%.bbappend
+++ b/recipes-graphics/piglit/piglit_%.bbappend
@@ -1,18 +1,10 @@
-# The oelint.vars.noncoreoverride suppressions below are the layer's
-# machine-gated dispatch idiom: none of it can carry an override of its own,
-# and all of it is inert off-target -- measured on qemuarm64 with bitbake -e,
-# meta-freescale in and out of BBLAYERS.
-
 # Standard bbappend idiom; cannot carry an override.
 # nooelint: oelint.vars.noncoreoverride
 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.
+# Both fix upstream cl tests generally, not on i.MX only, so scoping them would
+# leave the tests broken on every other machine. Both are filed upstream.
+# nooelint: oelint.vars.noncoreoverride
 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"