[oe-commits] org.oe.dev fic-gta0[1|2].conf: task-base handle alsa-states, no need to duplicate it here
mickeyl commit
openembedded-commits at lists.openembedded.org
Tue Jul 10 16:08:08 UTC 2007
fic-gta0[1|2].conf: task-base handle alsa-states, no need to duplicate it here
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 79a8be76eb7e634035b02729b67f9179fabb8711
ViewMTN: http://monotone.openembedded.org/revision.psp?id=79a8be76eb7e634035b02729b67f9179fabb8711
Files:
1
conf/machine/fic-gta01.conf
conf/machine/fic-gta02.conf
packages/tasks/task-base.bb
Diffs:
#
# mt diff -r4ea1a0b7c2e8cc96e7303233217fd57efa3b1b5b -r79a8be76eb7e634035b02729b67f9179fabb8711
#
#
#
# patch "conf/machine/fic-gta01.conf"
# from [23aa3fc9534120dd38935869df0535f58909579d]
# to [1c8e90287feedbc8f33cb1859b4e13cbf1007c10]
#
# patch "conf/machine/fic-gta02.conf"
# from [dbb06e41897ef8d2e5a888b86e3e8157bb667557]
# to [35a3ed508f3117b908249db21b5778bc4578be37]
#
# patch "packages/tasks/task-base.bb"
# from [8063e1b226de759fef34b1a23b3845f05b89bb7c]
# to [2b89141c35420f2a2ec89ff47305e1e4034c4067]
#
============================================================
--- conf/machine/fic-gta01.conf 23aa3fc9534120dd38935869df0535f58909579d
+++ conf/machine/fic-gta01.conf 1c8e90287feedbc8f33cb1859b4e13cbf1007c10
@@ -11,8 +11,6 @@ MACHINE_FEATURES = "kernel26 apm alsa bl
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
============================================================
--- conf/machine/fic-gta02.conf dbb06e41897ef8d2e5a888b86e3e8157bb667557
+++ conf/machine/fic-gta02.conf 35a3ed508f3117b908249db21b5778bc4578be37
@@ -11,8 +11,6 @@ MACHINE_FEATURES = "kernel26 apm alsa bl
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"
============================================================
--- packages/tasks/task-base.bb 8063e1b226de759fef34b1a23b3845f05b89bb7c
+++ packages/tasks/task-base.bb 2b89141c35420f2a2ec89ff47305e1e4034c4067
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro
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"
More information about the Openembedded-commits
mailing list