summaryrefslogtreecommitdiff
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:15:50 +0100
commit4d7b8da48a1df57bf8e08eff368564f7b47a5222 (patch)
tree3ff4fd6de40ddb86c439cfd0042caf4f46da96d0
parente5f2cc805509a23e160c6f05e6776d6d32e3ce98 (diff)
downloadopenembedded-core-4d7b8da48a1df57bf8e08eff368564f7b47a5222.tar.gz
openembedded-core-4d7b8da48a1df57bf8e08eff368564f7b47a5222.tar.bz2
openembedded-core-4d7b8da48a1df57bf8e08eff368564f7b47a5222.zip
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. Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-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
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r74"
+PR = "r75"
inherit task
@@ -205,8 +205,9 @@ RRECOMMENDS_task-base-pcmcia = "\
# Provide bluez-utils-compat utils for the time being, the binaries in that package will vanish soon from upstream releases, so beware!
-RDEPENDS_task-base-bluetooth = "\
+RDEPENDS_task-base-bluetooth = "\
bluez4 \
+ ${@base_contains('COMBINED_FEATURES', 'alsa', 'libasound-module-bluez', '',d)} \
"
RRECOMMENDS_task-base-bluetooth = "\