diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2007-07-10 16:41:35 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2007-07-10 16:41:35 +0000 |
| commit | 7cdc1d823b9b13836092c87a80e59b9ff720dd4c (patch) | |
| tree | 05d58a2ee4ae0b742eac39e1d860ab4ce1399189 | |
| parent | 8d7824dc72be5193f1f22c631434eaef77dec5ce (diff) | |
| parent | b637757122ebc8d238076b894c05a5d0bb2bd416 (diff) | |
merge of '6e8259e13dda6b19a59db6751153b5e9583486e2'
and '79a8be76eb7e634035b02729b67f9179fabb8711'
| -rw-r--r-- | conf/machine/fic-gta01.conf | 5 | ||||
| -rw-r--r-- | conf/machine/fic-gta02.conf | 5 | ||||
| -rw-r--r-- | packages/tasks/task-base.bb | 5 |
3 files changed, 3 insertions, 12 deletions
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" |