summaryrefslogtreecommitdiffstats
path: root/meta-audio-4a-framework
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 /meta-audio-4a-framework
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 'meta-audio-4a-framework')
-rw-r--r--meta-audio-4a-framework/recipes-core/packagegroups/packagegroup-agl-audio.bb2
-rw-r--r--meta-audio-4a-framework/recipes-multimedia/4a-hal-config/4a-hal-config.bb2
2 files changed, 2 insertions, 2 deletions
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 ec2c04d5..3b27a63c 100644
--- 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 32f42299..457b3d28 100644
--- 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}"