summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2012-01-02 18:20:30 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-17 14:53:02 +0000
commita70cc15b4b053ff01229010e55b37ed4487b8f3a (patch)
tree1e9693fc03a05e56c9bafb543f69e8e3a7082fff
parent896924c72e7b37c18819229e8160c34cdf4465c8 (diff)
downloadopenembedded-core-a70cc15b4b053ff01229010e55b37ed4487b8f3a.tar.gz
openembedded-core-a70cc15b4b053ff01229010e55b37ed4487b8f3a.tar.bz2
openembedded-core-a70cc15b4b053ff01229010e55b37ed4487b8f3a.zip
task-base: add VIRTUAL-RUNTIME_alsa-state to task-base-alsa
Define this to be the alsa-state package by default. This enables automatic configuration setting and restoration on systems with alsa. Signed-off-by: Joshua Lock <josh@linux.intel.com>
-rw-r--r--meta/conf/distro/include/default-providers.inc1
-rw-r--r--meta/recipes-core/tasks/task-base.bb5
2 files changed, 4 insertions, 2 deletions
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index 244504968a..6615d55090 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -16,6 +16,7 @@ PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel"
#
VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth"
VIRTUAL-RUNTIME_apm ?= "apm"
+VIRTUAL-RUNTIME-alsa-state ?= "alsa-state"
#
# Default recipe providers
diff --git a/meta/recipes-core/tasks/task-base.bb b/meta/recipes-core/tasks/task-base.bb
index 12e171aa87..a7d7c406ff 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 = "r72"
+PR = "r73"
inherit task
@@ -180,7 +180,8 @@ RRECOMMENDS_task-base-vfat = "\
RDEPENDS_task-base-alsa = "\
alsa-utils-alsactl \
- alsa-utils-alsamixer"
+ alsa-utils-alsamixer \
+ ${VIRTUAL-RUNTIME-alsa-state}"
RRECOMMENDS_task-base-alsa = "\
kernel-module-snd-mixer-oss \