Fix 4a-mixer parsing error on nogfx build variant

The nogfx build variant fails with 4a enabled ( https://gerrit.automotivelinux.org/gerrit/#/c/15051/ )
This is documented in SPEC-1588.
To fix this we apply a conditional inclusion in meta-audio-4a-framework to only pull-in the mixer if
we are including meta-agl-demo. Can be more fine-grained (profile-graphical-qt5 maybe) later.

Bug-AGL: SPEC-1588

Fast inclusion requested as it is a blocker for RC2 due to enabling 4a in CI.

Change-Id: I59b82748ba8e1736358318373d29f8f9fed2a5c5
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>

diff --git a/meta-audio-4a-framework/conf/layer.conf b/meta-audio-4a-framework/conf/layer.conf
index 1b2ee27..7c3237a 100644 (file)
--- a/meta-audio-4a-framework/conf/layer.conf
+++ b/meta-audio-4a-framework/conf/layer.conf
@@ -1,6 +1,17 @@
 # We have a conf and classes directory, add to BBPATH
 BBPATH .= ":${LAYERDIR}"
 
+# Fix for SPEC-1588
+# Let us add layer-specific bbappends which are only applied when that
+# layer is included in our configuration -
+# e.g. only add layers if a bsp is present.
+# This is based on the BBFILE_COLLECTIONS name of the layer.
+BBFILES += "${@' '.join('${LAYERDIR}/meta-%s/recipes*/*/*.bbappend' % layer \
+               for layer in BBFILE_COLLECTIONS.split())}"
+BBFILES += "${@' '.join('${LAYERDIR}/meta-%s/recipes*/*/*.bb' % layer \
+               for layer in BBFILE_COLLECTIONS.split())}"
+
+
 # We have recipes-* directories, add to BBFILES
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
        ${LAYERDIR}/recipes-*/*/*.bbappend"

diff --git a/meta-audio-4a-framework/recipes-multimedia/4a-mixer/4a-mixer_git.bb b/meta-audio-4a-framework/meta-agl-demo/recipes-multimedia/4a-mixer/4a-mixer_git.bb
similarity index 100%
rename from meta-audio-4a-framework/recipes-multimedia/4a-mixer/4a-mixer_git.bb
rename to meta-audio-4a-framework/meta-agl-demo/recipes-multimedia/4a-mixer/4a-mixer_git.bb