[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 7a1da02bd94f0b587fc74b59217363239057f8fe

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 7a1da02bd94f0b587fc74b59217363239057f8fe

[git]

[-- Attachment #1: Type: text/plain, Size: 2978 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, thirteen has been updated
       via  7a1da02bd94f0b587fc74b59217363239057f8fe (commit)
       via  8b246743fa274e016ba2dd8b59b7f7651b8f53fc (commit)
      from  590bdf1b931a7fbede1e65192d824833c852ee5e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7a1da02bd94f0b587fc74b59217363239057f8fe
Merge: 8b24674 590bdf1
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Nov 10 22:59:53 2012 +0100

    Merge branch 'thirteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into thirteen

commit 8b246743fa274e016ba2dd8b59b7f7651b8f53fc
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Nov 9 09:55:18 2012 +0100

    udev: add missing alsa rules.

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/common/udev |    1 +
 config/udev/25-alsa.rules    |    8 ++++++++
 lfs/udev                     |    4 ++++
 3 files changed, 13 insertions(+), 0 deletions(-)
 create mode 100644 config/udev/25-alsa.rules

Difference in files:
diff --git a/config/rootfiles/common/udev b/config/rootfiles/common/udev
index 0d513f6..bacd0cb 100644
--- a/config/rootfiles/common/udev
+++ b/config/rootfiles/common/udev
@@ -30,6 +30,7 @@ lib/udev
 #lib/udev/path_id
 #lib/udev/rule_generator.functions
 #lib/udev/rules.d
+#lib/udev/rules.d/25-alsa.rules
 #lib/udev/rules.d/50-firmware.rules
 #lib/udev/rules.d/50-udev-default.rules
 #lib/udev/rules.d/60-cdrom_id.rules
diff --git a/config/udev/25-alsa.rules b/config/udev/25-alsa.rules
new file mode 100644
index 0000000..3e930cd
--- /dev/null
+++ b/config/udev/25-alsa.rules
@@ -0,0 +1,8 @@
+# alsa device go in their own subdirectory
+
+KERNEL=="controlC[0-9]*", NAME="snd/%k", GROUP="audio"
+KERNEL=="hw[CD0-9]*",     NAME="snd/%k", GROUP="audio"
+KERNEL=="pcm[CD0-9cp]*",  NAME="snd/%k", GROUP="audio"
+KERNEL=="midiC[D0-9]*",   NAME="snd/%k", GROUP="audio"
+KERNEL=="timer",          NAME="snd/%k", GROUP="audio"
+KERNEL=="seq",            NAME="snd/%k", GROUP="audio"
diff --git a/lfs/udev b/lfs/udev
index a16ba6f..9ebec2f 100644
--- a/lfs/udev
+++ b/lfs/udev
@@ -97,6 +97,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# Blacklist some modules
 	cp -vf $(DIR_SRC)/config/udev/blacklist /etc/modprobe.d/blacklist
 
+	# Install alsa rules.
+	install -v -m 644 $(DIR_SRC)/config/udev/25-alsa.rules \
+		/lib/udev/rules.d
+
 	# Install codel rules.
 	install -v -m 644 $(DIR_SRC)/config/udev/99-codel.rules \
 		/lib/udev/rules.d


hooks/post-receive
--
IPFire 2.x development tree