aboutsummaryrefslogtreecommitdiffstats
path: root/templates/feature
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2017-11-14 19:47:02 +0100
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2017-11-14 21:51:16 +0100
commit5c0da579b82902198e4a2e0dcb87dc7ec0cbf953 (patch)
tree2353ee953c89c18c4505bd8d962d2cd6e8034c02 /templates/feature
parent865324b3eb000b4dfb3489489592fb34d4ea88c6 (diff)
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>
Diffstat (limited to 'templates/feature')
-rw-r--r--templates/feature/agl-audio-4a-framework/50_local.conf.inc10
1 files changed, 10 insertions, 0 deletions
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 e75ea18c..19889d8e 100644
--- 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"