Comments on separate lines in udev rules

This commit is contained in:
Brendan Jones 2013-09-30 04:05:17 +02:00
parent fafbd52cb6
commit f3af56ed96
2 changed files with 87 additions and 1 deletions

View File

@ -0,0 +1,84 @@
--- libffado/60-ffado.rules
+++ libffado/60-ffado.rules
@@ -1,35 +1,58 @@
SUBSYSTEM!="firewire", GOTO="ffado_end"
-ATTR{vendor}=="0x000166", GROUP="audio", ENV{ID_FFADO}="1" # TC GROUP A/S
-ATTR{vendor}=="0x0001f2", GROUP="audio", ENV{ID_FFADO}="1" # Mark of the Unicorn, Inc. (aka MOTU)
-ATTR{vendor}=="0x0003db", GROUP="audio", ENV{ID_FFADO}="1" # Apogee Electronics Corp.
-ATTR{vendor}=="0x000595", GROUP="audio", ENV{ID_FFADO}="1" # Alesis Corporation
-ATTR{vendor}=="0x0007f5", GROUP="audio", ENV{ID_FFADO}="1" # Bridgeco Co AG
-ATTR{vendor}=="0x000a92", GROUP="audio", ENV{ID_FFADO}="1" # Presonus Corporation
-ATTR{vendor}=="0x000aac", GROUP="audio", ENV{ID_FFADO}="1" # TerraTec Electronic GmbH
-ATTR{vendor}=="0x000d6c", GROUP="audio", ENV{ID_FFADO}="1" # M-Audio
-ATTR{vendor}=="0x000f1b", GROUP="audio", ENV{ID_FFADO}="1" # Ego Systems Inc.
-ATTR{vendor}=="0x000ff2", GROUP="audio", ENV{ID_FFADO}="1" # Loud Technologies Inc.
-ATTR{vendor}=="0x001260", GROUP="audio", ENV{ID_FFADO}="1" # Stanton Magnetics,inc.
-ATTR{vendor}=="0x00130e", GROUP="audio", ENV{ID_FFADO}="1" # Focusrite Audio Engineering Limited
-ATTR{vendor}=="0x001486", GROUP="audio", ENV{ID_FFADO}="1" # Echo Digital Audio Corporation
-ATTR{vendor}=="0x001496", GROUP="audio", ENV{ID_FFADO}="1" # Phonic Corporation
-ATTR{vendor}=="0x001564", GROUP="audio", ENV{ID_FFADO}="1" # BEHRINGER Spezielle Studiotechnik GmbH
-ATTR{vendor}=="0x001c2d", GROUP="audio", ENV{ID_FFADO}="1" # FlexRadio Systems
-ATTR{vendor}=="0x001c6a", GROUP="audio", ENV{ID_FFADO}="1" # Weiss Engineering Ltd.
-ATTR{vendor}=="0x0040ab", GROUP="audio", ENV{ID_FFADO}="1" # ROLAND DG CORPORATION
-ATTR{vendor}=="0x000f64", GROUP="audio", ENV{ID_FFADO}="1" # DnR
+# TC GROUP A/S
+ATTR{vendor}=="0x000166", GROUP="audio", ENV{ID_FFADO}="1"
+# Mark of the Unicorn, Inc. (aka MOTU)
+ATTR{vendor}=="0x0001f2", GROUP="audio", ENV{ID_FFADO}="1"
+# Apogee Electronics Corp.
+ATTR{vendor}=="0x0003db", GROUP="audio", ENV{ID_FFADO}="1"
+# Alesis Corporation
+ATTR{vendor}=="0x000595", GROUP="audio", ENV{ID_FFADO}="1"
+# Bridgeco Co AG
+ATTR{vendor}=="0x0007f5", GROUP="audio", ENV{ID_FFADO}="1"
+# Presonus Corporation
+ATTR{vendor}=="0x000a92", GROUP="audio", ENV{ID_FFADO}="1"
+# TerraTec Electronic GmbH
+ATTR{vendor}=="0x000aac", GROUP="audio", ENV{ID_FFADO}="1"
+# M-Audio
+ATTR{vendor}=="0x000d6c", GROUP="audio", ENV{ID_FFADO}="1"
+# Ego Systems Inc.
+ATTR{vendor}=="0x000f1b", GROUP="audio", ENV{ID_FFADO}="1"
+# Loud Technologies Inc.
+ATTR{vendor}=="0x000ff2", GROUP="audio", ENV{ID_FFADO}="1"
+# Stanton Magnetics,inc.
+ATTR{vendor}=="0x001260", GROUP="audio", ENV{ID_FFADO}="1"
+# Focusrite Audio Engineering Limited
+ATTR{vendor}=="0x00130e", GROUP="audio", ENV{ID_FFADO}="1"
+# Echo Digital Audio Corporation
+ATTR{vendor}=="0x001486", GROUP="audio", ENV{ID_FFADO}="1"
+# Phonic Corporation
+ATTR{vendor}=="0x001496", GROUP="audio", ENV{ID_FFADO}="1"
+# BEHRINGER Spezielle Studiotechnik GmbH
+ATTR{vendor}=="0x001564", GROUP="audio", ENV{ID_FFADO}="1"
+# FlexRadio Systems
+ATTR{vendor}=="0x001c2d", GROUP="audio", ENV{ID_FFADO}="1"
+# Weiss Engineering Ltd.
+ATTR{vendor}=="0x001c6a", GROUP="audio", ENV{ID_FFADO}="1"
+# ROLAND DG CORPORATION
+ATTR{vendor}=="0x0040ab", GROUP="audio", ENV{ID_FFADO}="1"
+# DnR
+ATTR{vendor}=="0x000f64", GROUP="audio", ENV{ID_FFADO}="1"
# The devices below are by vendors who make other firewire devices in
# addition to their audio interfaces. They need more specific rules to
# ensure only audio interfaces are covered here.
-ATTR{vendor}=="0x00022e", ATTR{model}=="0x010067", GROUP="audio", ENV{ID_FFADO}="1" # Tascam, a subsiduary of TEAC (the OUI is TEAC's)
+# Tascam, a subsiduary of TEAC (the OUI is TEAC's)
+ATTR{vendor}=="0x00022e", ATTR{model}=="0x010067", GROUP="audio", ENV{ID_FFADO}="1"
# The devices below abuse another Vendor's ID, and therefore we need more advanced rules for those.
-ATTR{vendor}=="0x00000a", ATTR{model}=="0x030000", ATTR{units}=="*0x00a02d:0x010001*", GROUP="audio", ENV{ID_FFADO}="1" # CME, Matrix K FW
-ATTR{vendor}=="0x00000f", ATTR{model}=="0x01006?", ATTR{units}=="*0x00a02d:0x010001*", GROUP="audio", ENV{ID_FFADO}="1" # Mackie, Onyx Firewire
-ATTR{vendor}=="0x000a35", ATTR{units}=="0x000a35:0x00000[12]", GROUP="audio", ENV{ID_FFADO}="1" # RME
+# CME, Matrix K FW
+ATTR{vendor}=="0x00000a", ATTR{model}=="0x030000", ATTR{units}=="*0x00a02d:0x010001*", GROUP="audio", ENV{ID_FFADO}="1"
+# Mackie, Onyx Firewire
+ATTR{vendor}=="0x00000f", ATTR{model}=="0x01006?", ATTR{units}=="*0x00a02d:0x010001*", GROUP="audio", ENV{ID_FFADO}="1"
+# RME
+ATTR{vendor}=="0x000a35", ATTR{units}=="0x000a35:0x00000[12]", GROUP="audio", ENV{ID_FFADO}="1"
LABEL="ffado_end"

View File

@ -15,6 +15,7 @@ Source9: libffado-snapshot.sh
# We want the documentation for the library API only, not for the entire source:
# http://subversion.ffado.org/ticket/293
Patch0: libffado-api-doc-only.patch
Patch1: libffado-2.1.0-udev-rules.patch
BuildRequires: alsa-lib-devel
BuildRequires: dbus-c++-devel
BuildRequires: dbus-devel
@ -68,6 +69,7 @@ Applications and utilities for use with libffado.
%prep
%setup -q
%patch0 -p1 -b .api.doc.only
%patch1 -p0 -b .udev.rules
# We don't want to install all tests
sed -i '/Install/d' tests/{,*/}SConscript
@ -173,7 +175,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
- Update to svn2000.
- Drop the gold linker patch. The issue is properly solved upstream. See upstream tracker #293
* Mon Apr 26 2011 Brendan Jones <brendan.jones.it@gmail.com> - 2.1.0-0.3.20110426.svn1983
* Tue Apr 26 2011 Brendan Jones <brendan.jones.it@gmail.com> - 2.1.0-0.3.20110426.svn1983
- Update to svn1983
- Clean up redundant patches
- Patch to rebuild using gold linker. Fixes RHBZ#684392