From: Christopher Larson <chris_larson@mentor.com>
Date: Tue, 21 Aug 2012 18:10:00 +0000 (-0700)
Subject: task-base: pull in the bluez asound module when appropriate
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=48634df7bc17f70863e2d6ac77bd482424d5d7fc;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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>
---

diff --git a/meta/recipes-core/tasks/task-base.bb b/meta/recipes-core/tasks/task-base.bb
index 2325dbf291e..d5dd14079fa 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 = "\