Gentoo Archives: gentoo-commits

From: "Matthias Schwarzott (zzam)" <zzam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-fs/udev/files: udev-135-rules-update.diff udev-135-fix-capi.diff
Date: Wed, 03 Dec 2008 15:31:14
Message-Id: E1L7th2-0004eY-11@stork.gentoo.org
1 zzam 08/12/03 15:31:12
2
3 Added: udev-135-rules-update.diff udev-135-fix-capi.diff
4 Log:
5 Fix capi device nodes, Bug #249389. Do this by applying upstream patch to the common capi rules and install these. Remove capi from gentoo-specific rules.
6 (Portage version: 2.1.6_rc2/cvs/Linux 2.6.27-gentoo-r1 i686)
7
8 Revision Changes Path
9 1.1 sys-fs/udev/files/udev-135-rules-update.diff
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-135-rules-update.diff?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-135-rules-update.diff?rev=1.1&content-type=text/plain
13
14 Index: udev-135-rules-update.diff
15 ===================================================================
16 Index: udev-git/rules/gentoo/40-gentoo.rules
17 ===================================================================
18 --- udev-git.orig/rules/gentoo/40-gentoo.rules
19 +++ udev-git/rules/gentoo/40-gentoo.rules
20 @@ -1,9 +1,5 @@
21 # do not edit this file, it will be overwritten on update
22
23 -# capi devices
24 -KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20"
25 -KERNEL=="capi*", NAME="capi/%n"
26 -
27 # old devfs path, removing this could break systems
28 # Bug 195839
29 KERNEL=="md[0-9]*", SYMLINK+="md/%n"
30
31
32
33 1.1 sys-fs/udev/files/udev-135-fix-capi.diff
34
35 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-135-fix-capi.diff?rev=1.1&view=markup
36 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-135-fix-capi.diff?rev=1.1&content-type=text/plain
37
38 Index: udev-135-fix-capi.diff
39 ===================================================================
40 commit 1ac8fad8e56097cf8e08a0a17f044309317cb50f
41 Author: Kay Sievers <kay.sievers@××××.org>
42 Date: Wed Dec 3 01:32:00 2008 +0100
43
44 rules: fix isdn rules
45
46 On Tue, Dec 2, 2008 at 21:07, Matthias Schwarzott <zzam@g.o> wrote:
47 > It seems that the rules related to capi devices are not correct:
48 >
49 > KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20"
50 > KERNEL=="capi*", NAME="capi/%n"
51 >
52 > Changing the second rule to match only on KERNEL=="capi[0-9]*" is reported to
53 > make it work.
54 > So I can only guess that the problem is the second rule overwriting the NAME
55 > set by the first one.
56
57 diff --git a/rules/packages/40-isdn.rules b/rules/packages/40-isdn.rules
58 index f2bc34e..8a4686f 100644
59 --- a/rules/packages/40-isdn.rules
60 +++ b/rules/packages/40-isdn.rules
61 @@ -1,5 +1,4 @@
62 # do not edit this file, it will be overwritten on update
63
64 -SUBSYSTEM=="capi", GROUP="uucp"
65 -KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20"
66 -KERNEL=="capi*", NAME="capi/%n"
67 +SUBSYSTEM=="capi", KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20", GROUP="uucp"
68 +SUBSYSTEM=="tty", KERNEL=="capi[0-9]*", NAME="capi/%n"