summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2007-09-13 01:12:57 +0000
committerMichael Lauer <mickey@vanille-media.de>2007-09-13 01:12:57 +0000
commitf8a2fa8c7e3e72a9a6349af8248f2606d30f0590 (patch)
tree05102dd573c8fbdb6eaa420d3e12f8ae0803abdf
parent486d50385fdfc8efe32aba47b7a47989efb76e30 (diff)
parentbbc2776c0d955da7ec774ae934c541f33133f876 (diff)
merge of 'bdcb6216662449a5df98e3180f1fafcd2fb13858'
and 'ccee86b315f75cb78aaeb21eeb14a0b85ad9dec9'
-rw-r--r--packages/alsa/alsa-state.bb16
-rw-r--r--packages/alsa/alsa-state/asoundrc12
2 files changed, 20 insertions, 8 deletions
diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb
index 00669e48de..55541872fa 100644
--- a/packages/alsa/alsa-state.bb
+++ b/packages/alsa/alsa-state.bb
@@ -1,20 +1,19 @@
-#! /bin/sh
-#
# Copyright Matthias Hentges <devel@hentges.net> (c) 2007
# License: MIT (see http://www.opensource.org/licenses/mit-license.php
# for a copy of the license)
#
# Filename: alsa-state.bb
-# Date: 20070308 (YMD)
DESCRIPTION = "Default ALSA configuration"
LICENSE = "GPL"
RRECOMMENDS_alsa-state = "alsa-states"
-PV = "0.0.4"
-PR = "r3"
+PV = "0.1.0"
+PR = "r0"
-SRC_URI = "file://asound.state \
- file://alsa-state "
+SRC_URI = " \
+ file://asoundrc \
+ file://asound.state \
+ file://alsa-state "
SRC_URI_append_fic-gta01 = " \
file://capturehandset.state \
@@ -33,11 +32,12 @@ do_install() {
install -d ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/alsa-state ${D}${sysconfdir}/init.d
+ install -m 0644 ${WORKDIR}/asoundrc ${D}${sysconfdir}
install -m 0644 ${WORKDIR}/*.state ${D}${sysconfdir}
}
PACKAGES += "alsa-states"
-FILES_${PN} = "${sysconfdir}/init.d"
+FILES_${PN} = "${sysconfdir}/init.d ${sysconfdir}/asoundrc"
FILES_alsa-states = "${sysconfdir}/*.state"
PACKAGE_ARCH_${PN} = "all"
PACKAGE_ARCH_alsa-states = "${MACHINE}"
diff --git a/packages/alsa/alsa-state/asoundrc b/packages/alsa/alsa-state/asoundrc
new file mode 100644
index 0000000000..bc038e3e73
--- /dev/null
+++ b/packages/alsa/alsa-state/asoundrc
@@ -0,0 +1,12 @@
+#
+# simple dmix configuration
+#
+pcm.dsp0 {
+ type plug
+ slave.pcm "dmix"
+}
+
+ctl.mixer0 {
+ type hw
+ card 0
+}