[oe-commits] org.oe.dev fic-gta0[0|1].conf: move recommendation of alsa-state(s) from task-openmoko to machine configuration

[mickeyl commit]

fic-gta0[0|1].conf: move recommendation of alsa-state(s) from task-openmoko to machine configuration

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 4ea1a0b7c2e8cc96e7303233217fd57efa3b1b5b
ViewMTN: http://monotone.openembedded.org/revision.psp?id=4ea1a0b7c2e8cc96e7303233217fd57efa3b1b5b
Files:
1
conf/machine/fic-gta01.conf
conf/machine/fic-gta02.conf
packages/tasks/task-openmoko.bb
Diffs:

#
# mt diff -rf11eddc20106a8b07bde25c3ee9e5ffc8d81f7bd -r4ea1a0b7c2e8cc96e7303233217fd57efa3b1b5b
#
# 
# 
# patch "conf/machine/fic-gta01.conf"
#  from [1c3c67459b5584e2defd8c40e278b0e5bfff7066]
#    to [23aa3fc9534120dd38935869df0535f58909579d]
# 
# patch "conf/machine/fic-gta02.conf"
#  from [f432dd6889c55c316032a7acbf4d55670603e3e1]
#    to [dbb06e41897ef8d2e5a888b86e3e8157bb667557]
# 
# patch "packages/tasks/task-openmoko.bb"
#  from [4c34acfd5d530e57627e163ab546ffbfebf5988d]
#    to [ec3fef5477399d4762dbd4338b3c5f44bafa2f96]
# 
============================================================
--- conf/machine/fic-gta01.conf	1c3c67459b5584e2defd8c40e278b0e5bfff7066
+++ conf/machine/fic-gta01.conf	23aa3fc9534120dd38935869df0535f58909579d
@@ -13,7 +13,7 @@ MACHINE_EXTRA_RDEPENDS = "alsa-state"
 
 MACHINE_EXTRA_RDEPENDS = "alsa-state"
 
-# package gta01 specific modules
+# package machine specific modules
 MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-gta01-pm-bt  \
   kernel-module-gta01-pm-gps \
@@ -26,7 +26,10 @@ MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-snd-soc-smdk2440 \
   kernel-module-nls-iso8859-1 \
   kernel-module-nls-cp437 \
-  alsa-state"
+  \
+  alsa-state \
+  alsa-states \
+"
 
 # do not outcomment, we bypass the sysvinit.bb logic here -- see FIC GTA01 inittab
 #SERIAL_CONSOLE = "115200 ttySAC0"
============================================================
--- conf/machine/fic-gta02.conf	f432dd6889c55c316032a7acbf4d55670603e3e1
+++ conf/machine/fic-gta02.conf	dbb06e41897ef8d2e5a888b86e3e8157bb667557
@@ -13,7 +13,7 @@ MACHINE_EXTRA_RDEPENDS = "alsa-state"
 
 MACHINE_EXTRA_RDEPENDS = "alsa-state"
 
-# package gta01 specific modules
+# package machine specific modules
 MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-gta01-pm-bt  \
   kernel-module-gta01-pm-gps \
@@ -21,7 +21,15 @@ MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-gta01kbd \
   kernel-module-s3cmci \
   kernel-module-ext2 \
-  alsa-state"
+  kernel-module-vfat \
+  kernel-module-snd-soc-neo1973-wm8753 \
+  kernel-module-snd-soc-smdk2440 \
+  kernel-module-nls-iso8859-1 \
+  kernel-module-nls-cp437 \
+  \
+  alsa-state \
+  alsa-states \
+"
 
 SERIAL_CONSOLE = "115200 ttySAC2"
 
============================================================
--- packages/tasks/task-openmoko.bb	4c34acfd5d530e57627e163ab546ffbfebf5988d
+++ packages/tasks/task-openmoko.bb	ec3fef5477399d4762dbd4338b3c5f44bafa2f96
@@ -1,8 +1,8 @@ PROVIDES = "task-openmoko-everything"
 DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
 PROVIDES = "task-openmoko-everything"
-PR = "r47"
+PR = "r49"
 
 ALLOW_EMPTY = "1"
 PACKAGE_ARCH = "all"
@@ -169,7 +169,6 @@ RDEPENDS_task-openmoko-debug = "\
 #
 DESCRIPTION_task-openmoko-debug = "OpenMoko: Debugging Tools"
 RDEPENDS_task-openmoko-debug = "\
-  alsa-state \
   alsa-utils-amixer \
   alsa-utils-aplay \
   alsa-utils-aconnect \