[SM-Commit] GIT changes to master grimoire by Flavien Bridault (e2a7f3eea6ebba61ce0b0e6b094b372ecfc1b967)

Flavien Bridault scm at mail.sourcemage.org
Wed Jun 21 13:56:53 EDT 2006


GIT changes to master grimoire by Flavien Bridault <vlaaad at sourcemage.org>:

 disk/udev/DETAILS                |    2 +-
 disk/udev/HISTORY                |    5 +++++
 disk/udev/rules/50-default.rules |   15 ---------------
 3 files changed, 6 insertions(+), 16 deletions(-)

New commits:
commit e2a7f3eea6ebba61ce0b0e6b094b372ecfc1b967
Merge: 4698ba086658f1469d7e3ab811e3e9220b977759 001d92b982a21f3f83d1a7b296c6fc52ec2b513d
Author: Flavien Bridault <vlaaad at sourcemage.org>
Commit: Flavien Bridault <vlaaad at sourcemage.org>

    Merge branch 'master' of ssh://fbridault@scm.sourcemage.org/smgl/grimoire

commit 4698ba086658f1469d7e3ab811e3e9220b977759
Author: Flavien Bridault <vlaaad at sourcemage.org>
Commit: Flavien Bridault <vlaaad at sourcemage.org>

    Corrected bug #12662 - udev rules shouldn't move sound devices to a subdir

diff --git a/disk/udev/DETAILS b/disk/udev/DETAILS
index 7331b92..8d4e25a 100755
--- a/disk/udev/DETAILS
+++ b/disk/udev/DETAILS
@@ -14,7 +14,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
         WEB_SITE=http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
          ENTERED=20030725
          UPDATED=20060107
-      PATCHLEVEL=12
+      PATCHLEVEL=13
             DOCS="ChangeLog COPYING FAQ README docs/* RELEASE-NOTES"
       LICENSE[0]=GPL
         KEYWORDS="disk devices nodes modules"
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY
index 7e4d49e..dc9b4c0 100644
--- a/disk/udev/HISTORY
+++ b/disk/udev/HISTORY
@@ -1,3 +1,8 @@
+2006-06-21 Flavien Bridault <vlaaad at sourcemage.org>
+	* rules/50-default.rules: removed OSS sound devices from /dev/sound
+	  (bug #12662)
+	* DETAILS: PATCHLEVEL++ 
+	
 2006-06-17 Flavien Bridault <vlaaad at sourcemage.org>
 	* DETAILS: added 094. This one is not compatible with kernels older 
 	  than 2.6.15rc1 because of udevsend, so we will keep both 092 and 
diff --git a/disk/udev/rules/50-default.rules b/disk/udev/rules/50-default.rules
index e6f573d..28b6e5b 100644
--- a/disk/udev/rules/50-default.rules
+++ b/disk/udev/rules/50-default.rules
@@ -60,21 +60,6 @@ KERNEL=="nst*", 	NAME="%k"
 KERNEL=="osst*", 	NAME="%k"
 KERNEL=="nosst*", 	NAME="%k"
 
-# sound devices
-KERNEL=="admmidi", 		NAME="sound/%k", SYMLINK="%k"
-KERNEL=="adsp", 		NAME="sound/%k", SYMLINK="%k"
-KERNEL=="amidi", 		NAME="sound/%k", SYMLINK="%k"
-KERNEL=="adsp[0-9]*", 		NAME="sound/%k", SYMLINK="%k"
-KERNEL=="audio", 		NAME="sound/%k", SYMLINK="%k"
-KERNEL=="dmmidi", 		NAME="sound/%k", SYMLINK="%k"
-KERNEL=="audio[0-9]*", 		NAME="sound/%k", SYMLINK="%k"
-KERNEL=="dsp", 			NAME="sound/%k", SYMLINK="%k"
-KERNEL=="dsp[0-9]*", 		NAME="sound/%k", SYMLINK="%k"
-KERNEL=="mixer", 		NAME="sound/%k", SYMLINK="%k"
-KERNEL=="mixer[0-9]*", 		NAME="sound/%k", SYMLINK="%k"
-KERNEL=="sequencer", 		NAME="sound/%k", SYMLINK="%k"
-KERNEL=="sequencer[0-9]*", 	NAME="sound/%k", SYMLINK="%k"
-
 # input devices
 KERNEL=="mice", 	NAME="input/%k", MODE="0644"
 KERNEL=="mouse*", 	NAME="input/%k", MODE="0644"



More information about the SM-Commit mailing list