summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2012-08-21 11:10:00 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-23 11:43:34 +0100
commit48634df7bc17f70863e2d6ac77bd482424d5d7fc (patch)
treea382e80a5c1a72fb2379be5108663c16f01da0ca /meta
parentd48585caf9cf13c06eabc068b3c3a17a3f92636d (diff)
downloadpoky-48634df7bc17f70863e2d6ac77bd482424d5d7fc.tar.gz
task-base: pull in the bluez asound module when appropriate
If the machine and distro both want alsa, then have task-base-bluetooth pull in the libasound-module-bluez package. (From OE-Core rev: 4d7b8da48a1df57bf8e08eff368564f7b47a5222) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/tasks/task-base.bb5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-core/tasks/task-base.bb b/meta/recipes-core/tasks/task-base.bb
index 2325dbf291..d5dd14079f 100644
--- a/meta/recipes-core/tasks/task-base.bb
+++ b/meta/recipes-core/tasks/task-base.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/p
2LICENSE = "MIT" 2LICENSE = "MIT"
3LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 3LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
4 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 4 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
5PR = "r74" 5PR = "r75"
6 6
7inherit task 7inherit task
8 8
@@ -205,8 +205,9 @@ RRECOMMENDS_task-base-pcmcia = "\
205 205
206# Provide bluez-utils-compat utils for the time being, the binaries in that package will vanish soon from upstream releases, so beware! 206# Provide bluez-utils-compat utils for the time being, the binaries in that package will vanish soon from upstream releases, so beware!
207 207
208RDEPENDS_task-base-bluetooth = "\ 208RDEPENDS_task-base-bluetooth = "\
209 bluez4 \ 209 bluez4 \
210 ${@base_contains('COMBINED_FEATURES', 'alsa', 'libasound-module-bluez', '',d)} \
210 " 211 "
211 212
212RRECOMMENDS_task-base-bluetooth = "\ 213RRECOMMENDS_task-base-bluetooth = "\