Fix runtime package conflict on asound.conf

alsa-state and 4a-hal-config both provides the same file.
Fix the abstract provisioning by using the original
flag VIRTUAL-RUNTIME_alsa-state = 4a-hal-config .

v2: fix also RRECOMMENDS_pn-alsa-utils-alsactl

v3: kill everything that might still pull-in alsa-state directly

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

diff --git a/meta-audio-4a-framework/recipes-core/packagegroups/packagegroup-agl-audio.bb b/meta-audio-4a-framework/recipes-core/packagegroups/packagegroup-agl-audio.bb
index ec2c04d..3b27a63 100644 (file)
--- a/meta-audio-4a-framework/recipes-core/packagegroups/packagegroup-agl-audio.bb
+++ b/meta-audio-4a-framework/recipes-core/packagegroups/packagegroup-agl-audio.bb
@@ -12,5 +12,5 @@ RDEPENDS_${PN} += "\
     4a-alsa-core \
     4a-hal-reference \
     agl-service-audio-4a \
-    virtual/4a-hal-config \
+    VIRTUAL-RUNTIME_alsa-state \
 "

diff --git a/meta-audio-4a-framework/recipes-multimedia/4a-hal-config/4a-hal-config.bb b/meta-audio-4a-framework/recipes-multimedia/4a-hal-config/4a-hal-config.bb
index 32f4229..457b3d2 100644 (file)
--- a/meta-audio-4a-framework/recipes-multimedia/4a-hal-config/4a-hal-config.bb
+++ b/meta-audio-4a-framework/recipes-multimedia/4a-hal-config/4a-hal-config.bb
@@ -12,7 +12,7 @@ SRC_URI = "file://asound.conf.template \
 
 PV = "0.1"
 
-RPROVIDES_${PN} = "virtual/4a-hal-config"
+RPROVIDES_${PN} += "VIRTUAL-RUNTIME_alsa-state"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 

diff --git a/templates/feature/agl-audio-4a-framework/50_local.conf.inc b/templates/feature/agl-audio-4a-framework/50_local.conf.inc
index e75ea18..19889d8 100644 (file)
--- a/templates/feature/agl-audio-4a-framework/50_local.conf.inc
+++ b/templates/feature/agl-audio-4a-framework/50_local.conf.inc
@@ -2,3 +2,13 @@
 # enables the following line:
 #
 DISTRO_FEATURES_append = " agl-audio-4a-framework "
+
+# asound.conf is provided by the 4a-hal-config (and not by asound.state)
+VIRTUAL-RUNTIME_alsa-state = "4a-hal-config"
+# additionally there is a bug in alsa-utils-alsactl where it pulls in alsa-state directly
+RRECOMMENDS_pn-alsa-utils-alsactl = "VIRTUAL-RUNTIME_alsa-state"
+
+# why should a config package have -dev ... I'll leave that answer to you.
+PACKAGES_pn-alsa-state_remove = "alsa-state-dev"
+PACKAGES_pn-alsa-state_remove = "alsa-states-dev"
+PACKAGES_pn-alsa-state = "alsa-state alsa-states"