From 7ae6ec453b299165a25cf19a6f63ad5c1f30cf55 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sat, 12 Nov 2011 04:31:40 +0100
Subject: [PATCH] alsa-utils: move soundconfig to /usr/lib/udev, cleanup

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/audio/alsa-utils/install              |  5 +++--
 packages/audio/alsa-utils/udev.d/40-alsa.rules | 13 +------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/packages/audio/alsa-utils/install b/packages/audio/alsa-utils/install
index a599857b56..f5284f5a5c 100755
--- a/packages/audio/alsa-utils/install
+++ b/packages/audio/alsa-utils/install
@@ -25,13 +25,14 @@
 mkdir -p $INSTALL/usr/bin
   cp $PKG_BUILD/amixer/amixer $INSTALL/usr/bin
   cp $PKG_BUILD/aplay/aplay $INSTALL/usr/bin
-  cp $PKG_DIR/scripts/soundconfig $INSTALL/usr/bin
   cp $PKG_BUILD/speaker-test/speaker-test $INSTALL/usr/bin
 
+mkdir -p $INSTALL/usr/lib/udev
+  cp $PKG_DIR/scripts/soundconfig $INSTALL/usr/lib/udev
+
 mkdir -p $INSTALL/usr/sbin
   cp $PKG_BUILD/alsactl/alsactl $INSTALL/usr/sbin
 
 mkdir -p $INSTALL/usr/share/alsa/init
   cp $PKG_BUILD/alsactl/init/* $INSTALL/usr/share/alsa/init
   rm -rf $INSTALL/usr/share/alsa/init/Makefile*
-
diff --git a/packages/audio/alsa-utils/udev.d/40-alsa.rules b/packages/audio/alsa-utils/udev.d/40-alsa.rules
index fba4e61f66..c20bd742ae 100644
--- a/packages/audio/alsa-utils/udev.d/40-alsa.rules
+++ b/packages/audio/alsa-utils/udev.d/40-alsa.rules
@@ -18,16 +18,5 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-# 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/bin/soundconfig"
-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"
-KERNEL=="mixer0",          SYMLINK+="mixer"
+  KERNEL=="controlC[0-9]*",  NAME="snd/%k", ACTION=="add", RUN+="soundconfig"