From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 10 Jul 2007 15:57:50 +0000 (+0000)
Subject: fic-gta0[1|2].conf: task-base handle alsa-states, no need to duplicate it here
X-Git-Tag: Release-2010-05/1~8868^2~176^2~1^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b637757122ebc8d238076b894c05a5d0bb2bd416;p=openembedded.git

fic-gta0[1|2].conf: task-base handle alsa-states, no need to duplicate it here
---

diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf
index bdfc3a6f47..4e07379582 100644
--- a/conf/machine/fic-gta01.conf
+++ b/conf/machine/fic-gta01.conf
@@ -11,8 +11,6 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-gta01"
 
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone"
 
-MACHINE_EXTRA_RDEPENDS = "alsa-state"
-
 # package machine specific modules
 MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-gta01-pm-bt  \
@@ -26,9 +24,6 @@ MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-snd-soc-smdk2440 \
   kernel-module-nls-iso8859-1 \
   kernel-module-nls-cp437 \
-  \
-  alsa-state \
-  alsa-states \
 "
 
 # do not outcomment, we bypass the sysvinit.bb logic here -- see FIC GTA01 inittab
diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf
index de6de24ec1..45483fd21e 100644
--- a/conf/machine/fic-gta02.conf
+++ b/conf/machine/fic-gta02.conf
@@ -11,8 +11,6 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-gta02"
 
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone wifi"
 
-MACHINE_EXTRA_RDEPENDS = "alsa-state"
-
 # package machine specific modules
 MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-gta01-pm-bt  \
@@ -26,9 +24,6 @@ MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-snd-soc-smdk2440 \
   kernel-module-nls-iso8859-1 \
   kernel-module-nls-cp437 \
-  \
-  alsa-state \
-  alsa-states \
 "
 
 SERIAL_CONSOLE = "115200 ttySAC2"
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index c7dbf15388..368e9374d2 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r39"
+PR = "r40"
 
 DEPENDS = "task-boot"
 PROVIDES = "${PACKAGES}"
@@ -190,10 +190,11 @@ RDEPENDS_task-base-alsa = "\
     alsa-utils-alsamixer"
 
 #
-# alsa-state is machine related so can be missing in feed, OSS support is optional
+# alsa-states are machine related so can be missing in feed, OSS support is optional
 #
 RRECOMMENDS_task-base-alsa = "\
     alsa-state \
+    alsa-states \
     kernel-module-snd-mixer-oss \
     kernel-module-snd-pcm-oss"