imx-base: Build the consumers of per-SoC recipes per SoC

fsl-dynamic-packagearch moves a recipe to MACHINE_SOCARCH only when it
directly depends on something in MACHINE_SOCARCH_FILTER. A recipe built
against one of those per-SoC recipes keeps the shared tune arch, so two
SoCs build it differently under one package arch: connman-gnome, the
matchbox applications and the xf86 drivers through gtk+3 and the X
server, libva-utils through libva, the libsndfile1 and pulseaudio
consumers on the NXP BSP, and on the GPU-less i.MX 9 parts the whole GL
stack, which builds on the per-SoC libdrm-imx.

List the per-SoC recipes that others build against, so that their
consumers follow them: libdrm and the GL providers on the NXP BSP, GPU
or not, its audio chain, and gtk+3, gtk4, libepoxy, libva,
virtual/xserver, vulkan-loader, webkitgtk and packagegroup-self-hosted
on both BSPs.

Checked with bitbake -S lockedsigs world on 18 i.MX and Layerscape
machines covering every i.MX tune: no task signature differs between
machines sharing a package arch. The moved packages keep their content.

Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br>

1 files changed, 30 insertions, 0 deletions

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 6e60143f0..ff6db1b14 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -411,6 +411,36 @@ MACHINE_SOCARCH_FILTER:append:mx8qm-nxp-bsp = " \
     virtual/libopenvx \
 "
 
+# fsl-dynamic-packagearch promotes only the direct consumers of the recipes
+# above, but a recipe built against one of those consumers differs per SoC as
+# well. List the consumers that other recipes build against, so that their
+# own consumers follow them instead of differing under the shared tune.
+#
+# On the NXP BSP libdrm is the per-SoC libdrm-imx even without a GPU, so the
+# GL stack built on it follows it there too.
+MACHINE_SOCARCH_FILTER:append:imx-nxp-bsp = " \
+    libdrm \
+    libsndfile1 \
+    mpg123 \
+    pulseaudio \
+    virtual/egl \
+    virtual/libgl \
+    virtual/libgles2 \
+    virtual/mesa \
+"
+MACHINE_SOCARCH_CONSUMERS = " \
+    gtk+3 \
+    gtk4 \
+    libepoxy \
+    libva \
+    packagegroup-self-hosted \
+    virtual/xserver \
+    vulkan-loader \
+    webkitgtk \
+"
+MACHINE_SOCARCH_FILTER:append:imx-nxp-bsp = " ${MACHINE_SOCARCH_CONSUMERS}"
+MACHINE_SOCARCH_FILTER:append:imx-mainline-bsp = " ${MACHINE_SOCARCH_CONSUMERS}"
+
 INHERIT += "fsl-dynamic-packagearch"
 
 SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS:append = " \