From 00704d91026f0ea87c1b4aff3b4167f71358ee13 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 6 Nov 2009 15:12:38 +0100 Subject: [PATCH] alsa-utils: - rework of init scripts --- .../audio/alsa-utils/config/15-alsa.rules.geexbox | 13 ------------- .../audio/alsa-utils/config/rules.d/15-alsa.rules | 13 ------------- .../config/{15-alsa.rules => rules.d/40-alsa.rules} | 1 + packages/audio/alsa-utils/install | 5 ++++- 4 files changed, 5 insertions(+), 27 deletions(-) delete mode 100644 packages/audio/alsa-utils/config/15-alsa.rules.geexbox delete mode 100644 packages/audio/alsa-utils/config/rules.d/15-alsa.rules rename packages/audio/alsa-utils/config/{15-alsa.rules => rules.d/40-alsa.rules} (93%) diff --git a/packages/audio/alsa-utils/config/15-alsa.rules.geexbox b/packages/audio/alsa-utils/config/15-alsa.rules.geexbox deleted file mode 100644 index 7731aab2b9..0000000000 --- a/packages/audio/alsa-utils/config/15-alsa.rules.geexbox +++ /dev/null @@ -1,13 +0,0 @@ -# Give the audio group ownership of sound devices -SUBSYSTEM=="sound", GROUP="audio" -SUBSYSTEM=="snd", GROUP="audio" - -# ALSA Devices -# When a sound device is detected, restore the volume settings -KERNEL=="controlC[0-9]*", NAME="snd/%k", RUN="/etc/init.d/40_alsa" -KERNEL=="hw[CD0-9]*", NAME="snd/%k" -KERNEL=="pcm[CD0-9cp]*", NAME="snd/%k" -KERNEL=="midiC[D0-9]*", NAME="snd/%k" -KERNEL=="timer", NAME="snd/%k" -KERNEL=="seq", NAME="snd/%k" - diff --git a/packages/audio/alsa-utils/config/rules.d/15-alsa.rules b/packages/audio/alsa-utils/config/rules.d/15-alsa.rules deleted file mode 100644 index ebdb6c3bc9..0000000000 --- a/packages/audio/alsa-utils/config/rules.d/15-alsa.rules +++ /dev/null @@ -1,13 +0,0 @@ -# Give the audio group ownership of sound devices -SUBSYSTEM=="sound", GROUP="audio" -SUBSYSTEM=="snd", GROUP="audio" - -# ALSA Devices -# When a sound device is detected, restore the volume settings -KERNEL=="controlC[0-9]*", NAME="snd/%k", ACTION=="add", RUN+="/usr/sbin/alsactl restore %n" -KERNEL=="hw[CD0-9]*", NAME="snd/%k" -KERNEL=="pcm[CD0-9cp]*", NAME="snd/%k" -KERNEL=="midiC[D0-9]*", NAME="snd/%k" -KERNEL=="timer", NAME="snd/%k" -KERNEL=="seq", NAME="snd/%k" - diff --git a/packages/audio/alsa-utils/config/15-alsa.rules b/packages/audio/alsa-utils/config/rules.d/40-alsa.rules similarity index 93% rename from packages/audio/alsa-utils/config/15-alsa.rules rename to packages/audio/alsa-utils/config/rules.d/40-alsa.rules index ebdb6c3bc9..00c69c9f6d 100644 --- a/packages/audio/alsa-utils/config/15-alsa.rules +++ b/packages/audio/alsa-utils/config/rules.d/40-alsa.rules @@ -10,4 +10,5 @@ KERNEL=="pcm[CD0-9cp]*", NAME="snd/%k" KERNEL=="midiC[D0-9]*", NAME="snd/%k" KERNEL=="timer", NAME="snd/%k" KERNEL=="seq", NAME="snd/%k" +KERNEL=="mixer0", SYMLINK+="mixer" diff --git a/packages/audio/alsa-utils/install b/packages/audio/alsa-utils/install index f5fc7d506c..2f205f764c 100755 --- a/packages/audio/alsa-utils/install +++ b/packages/audio/alsa-utils/install @@ -16,8 +16,11 @@ rm -rf $INSTALL/usr/share/alsa/init/Makefile* mkdir -p $INSTALL/etc/udev/rules.d cp $PKG_DIR/config/rules.d/* $INSTALL/etc/udev/rules.d +mkdir -p $INSTALL/usr/config +cp $PKG_DIR/config/asound.state $INSTALL/usr/config + mkdir -p $INSTALL/etc -cp $PKG_DIR/config/asound.state $INSTALL/etc +ln -s /storage/.config/asound.state $INSTALL/etc/asound.state if [ "$DEVTOOLS" = yes ]; then mkdir -p $INSTALL/usr/bin