Patchwork task-base: pull in the bluez asound module when appropriate

login
register
mail settings
Submitter Christopher Larson
Date Aug. 21, 2012, 6:10 p.m.
Message ID <1345572600-21149-1-git-send-email-kergoth@gmail.com>
Download mbox | patch
Permalink /patch/35081/
State Accepted
Commit 4d7b8da48a1df57bf8e08eff368564f7b47a5222
Headers show

Comments

Christopher Larson - Aug. 21, 2012, 6:10 p.m.
From: Christopher Larson <chris_larson@mentor.com>

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>
---
 meta/recipes-core/tasks/task-base.bb |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
Saul Wold - Aug. 24, 2012, 6:18 p.m.
On 08/21/2012 11:10 AM, Christopher Larson wrote:
> From: Christopher Larson <chris_larson@mentor.com>
>
> 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>
> ---
>   meta/recipes-core/tasks/task-base.bb |    5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-core/tasks/task-base.bb b/meta/recipes-core/tasks/task-base.bb
> index 2325dbf..d5dd140 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 = "\
>

Merged into OE-Core

Thanks
	Sau!

Patch

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