source: patches/udev-124-lib64-1.patch@ af24f92

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since af24f92 was 95dd7e1, checked in by Joe Ciccone <jciccone@…>, 17 years ago

Update udev patch.
  • Property mode set to 100644
File size: 9.2 KB
RevLine 
[95dd7e1]1diff -Naur udev-124.orig/etc/udev/rules.d/50-udev-default.rules udev-124/etc/udev/rules.d/50-udev-default.rules
2--- udev-124.orig/etc/udev/rules.d/50-udev-default.rules 2008-06-12 01:24:30.000000000 -0400
3+++ udev-124/etc/udev/rules.d/50-udev-default.rules 2008-06-28 15:08:19.383343687 -0400
4@@ -103,5 +103,5 @@
5 KERNEL=="iowarrior[0-9]*", NAME="usb/%k"
6
7 # do not delete static device nodes
8-ACTION=="remove", NAME=="?*", TEST=="/lib/udev/devices/$name", OPTIONS+="ignore_remove"
9+ACTION=="remove", NAME=="?*", TEST=="/lib64/udev/devices/$name", OPTIONS+="ignore_remove"
10
11diff -Naur udev-124.orig/extras/ata_id/Makefile udev-124/extras/ata_id/Makefile
12--- udev-124.orig/extras/ata_id/Makefile 2008-06-12 01:24:30.000000000 -0400
13+++ udev-124/extras/ata_id/Makefile 2008-06-28 15:05:05.667519435 -0400
14@@ -16,7 +16,7 @@
15 sbindir = ${prefix}/sbin
16 usrbindir = ${prefix}/usr/bin
17 usrsbindir = ${prefix}/usr/sbin
18-libudevdir = ${prefix}/lib/udev
19+libudevdir = ${prefix}/lib64/udev
20 mandir = ${prefix}/usr/share/man
21 configdir = ${etcdir}/udev/
22
23diff -Naur udev-124.orig/extras/cdrom_id/Makefile udev-124/extras/cdrom_id/Makefile
24--- udev-124.orig/extras/cdrom_id/Makefile 2008-06-12 01:24:30.000000000 -0400
25+++ udev-124/extras/cdrom_id/Makefile 2008-06-28 15:04:54.009080964 -0400
26@@ -16,7 +16,7 @@
27 sbindir = ${prefix}/sbin
28 usrbindir = ${prefix}/usr/bin
29 usrsbindir = ${prefix}/usr/sbin
30-libudevdir = ${prefix}/lib/udev
31+libudevdir = ${prefix}/lib64/udev
32 mandir = ${prefix}/usr/share/man
33 configdir = ${etcdir}/udev
34
35diff -Naur udev-124.orig/extras/collect/Makefile udev-124/extras/collect/Makefile
36--- udev-124.orig/extras/collect/Makefile 2008-06-12 01:24:30.000000000 -0400
37+++ udev-124/extras/collect/Makefile 2008-06-28 15:04:44.156091083 -0400
38@@ -11,7 +11,7 @@
39 sbindir = ${prefix}/sbin
40 usrbindir = ${prefix}/usr/bin
41 usrsbindir = ${prefix}/usr/sbin
42-libudevdir = ${prefix}/lib/udev
43+libudevdir = ${prefix}/lib64/udev
44 mandir = ${prefix}/usr/share/man
45 configdir = ${etcdir}/udev/
46
47diff -Naur udev-124.orig/extras/edd_id/Makefile udev-124/extras/edd_id/Makefile
48--- udev-124.orig/extras/edd_id/Makefile 2008-06-12 01:24:30.000000000 -0400
49+++ udev-124/extras/edd_id/Makefile 2008-06-28 15:04:34.455054556 -0400
50@@ -16,7 +16,7 @@
51 sbindir = ${prefix}/sbin
52 usrbindir = ${prefix}/usr/bin
53 usrsbindir = ${prefix}/usr/sbin
54-libudevdir = ${prefix}/lib/udev
55+libudevdir = ${prefix}/lib64/udev
56 mandir = ${prefix}/usr/share/man
57 configdir = ${etcdir}/udev/
58
59diff -Naur udev-124.orig/extras/firmware/firmware.sh udev-124/extras/firmware/firmware.sh
60--- udev-124.orig/extras/firmware/firmware.sh 2008-06-12 01:24:30.000000000 -0400
61+++ udev-124/extras/firmware/firmware.sh 2008-06-28 15:04:12.355805544 -0400
62@@ -1,6 +1,6 @@
63 #!/bin/sh -e
64
65-FIRMWARE_DIRS="/lib/firmware /usr/local/lib/firmware"
66+FIRMWARE_DIRS="/lib64/firmware /lib/firmware /usr/local/lib64/firmware /usr/local/lib/firmware"
67
68 err() {
69 echo "$@" >&2
70diff -Naur udev-124.orig/extras/firmware/Makefile udev-124/extras/firmware/Makefile
71--- udev-124.orig/extras/firmware/Makefile 2008-06-12 01:24:30.000000000 -0400
72+++ udev-124/extras/firmware/Makefile 2008-06-28 15:04:22.552690448 -0400
73@@ -13,7 +13,7 @@
74 sbindir = ${prefix}/sbin
75 usrbindir = ${prefix}/usr/bin
76 usrsbindir = ${prefix}/usr/sbin
77-libudevdir = ${prefix}/lib/udev
78+libudevdir = ${prefix}/lib64/udev
79 mandir = ${prefix}/usr/share/man
80 configdir = ${etcdir}/udev/
81
82diff -Naur udev-124.orig/extras/floppy/Makefile udev-124/extras/floppy/Makefile
83--- udev-124.orig/extras/floppy/Makefile 2008-06-12 01:24:30.000000000 -0400
84+++ udev-124/extras/floppy/Makefile 2008-06-28 15:03:45.907884474 -0400
85@@ -16,7 +16,7 @@
86 sbindir = ${prefix}/sbin
87 usrbindir = ${prefix}/usr/bin
88 usrsbindir = ${prefix}/usr/sbin
89-libudevdir = ${prefix}/lib/udev
90+libudevdir = ${prefix}/lib64/udev
91 mandir = ${prefix}/usr/share/man
92 configdir = ${etcdir}/udev/
93
94diff -Naur udev-124.orig/extras/fstab_import/Makefile udev-124/extras/fstab_import/Makefile
95--- udev-124.orig/extras/fstab_import/Makefile 2008-06-12 01:24:30.000000000 -0400
96+++ udev-124/extras/fstab_import/Makefile 2008-06-28 15:03:36.456771831 -0400
97@@ -16,7 +16,7 @@
98 sbindir = ${prefix}/sbin
99 usrbindir = ${prefix}/usr/bin
100 usrsbindir = ${prefix}/usr/sbin
101-libudevdir = ${prefix}/lib/udev
102+libudevdir = ${prefix}/lib64/udev
103 mandir = ${prefix}/usr/share/man
104 configdir = ${etcdir}/udev/
105
106diff -Naur udev-124.orig/extras/path_id/Makefile udev-124/extras/path_id/Makefile
107--- udev-124.orig/extras/path_id/Makefile 2008-06-12 01:24:30.000000000 -0400
108+++ udev-124/extras/path_id/Makefile 2008-06-28 15:03:26.182910124 -0400
109@@ -13,7 +13,7 @@
110 sbindir = ${prefix}/sbin
111 usrbindir = ${prefix}/usr/bin
112 usrsbindir = ${prefix}/usr/sbin
113-libudevdir = ${prefix}/lib/udev
114+libudevdir = ${prefix}/lib64/udev
115 mandir = ${prefix}/usr/share/man
116 configdir = ${etcdir}/udev/
117
118diff -Naur udev-124.orig/extras/rule_generator/Makefile udev-124/extras/rule_generator/Makefile
119--- udev-124.orig/extras/rule_generator/Makefile 2008-06-12 01:24:30.000000000 -0400
120+++ udev-124/extras/rule_generator/Makefile 2008-06-28 15:02:01.446795250 -0400
121@@ -13,7 +13,7 @@
122 sbindir = ${prefix}/sbin
123 usrbindir = ${prefix}/usr/bin
124 usrsbindir = ${prefix}/usr/sbin
125-libudevdir = ${prefix}/lib/udev
126+libudevdir = ${prefix}/lib64/udev
127 mandir = ${prefix}/usr/share/man
128 configdir = ${etcdir}/udev
129
130diff -Naur udev-124.orig/extras/rule_generator/write_cd_rules udev-124/extras/rule_generator/write_cd_rules
131--- udev-124.orig/extras/rule_generator/write_cd_rules 2008-06-12 01:24:30.000000000 -0400
132+++ udev-124/extras/rule_generator/write_cd_rules 2008-06-28 15:01:37.457123739 -0400
133@@ -13,7 +13,7 @@
134
135 RULES_FILE="/etc/udev/rules.d/70-persistent-cd.rules"
136
137-. /lib/udev/rule_generator.functions
138+. /lib64/udev/rule_generator.functions
139
140 find_next_available() {
141 raw_find_next_available "$(find_all_rules 'SYMLINK+=' "$1")"
142diff -Naur udev-124.orig/extras/rule_generator/write_net_rules udev-124/extras/rule_generator/write_net_rules
143--- udev-124.orig/extras/rule_generator/write_net_rules 2008-06-12 01:24:30.000000000 -0400
144+++ udev-124/extras/rule_generator/write_net_rules 2008-06-28 15:01:22.066824977 -0400
145@@ -24,7 +24,7 @@
146
147 RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules'
148
149-. /lib/udev/rule_generator.functions
150+. /lib64/udev/rule_generator.functions
151
152 interface_name_taken() {
153 local value="$(find_all_rules 'NAME=' $INTERFACE)"
154diff -Naur udev-124.orig/extras/scsi_id/Makefile udev-124/extras/scsi_id/Makefile
155--- udev-124.orig/extras/scsi_id/Makefile 2008-06-12 01:24:30.000000000 -0400
156+++ udev-124/extras/scsi_id/Makefile 2008-06-28 15:00:48.630039098 -0400
157@@ -19,7 +19,7 @@
158 sbindir = ${prefix}/sbin
159 usrbindir = ${prefix}/usr/bin
160 usrsbindir = ${prefix}/usr/sbin
161-libudevdir = ${prefix}/lib/udev
162+libudevdir = ${prefix}/lib64/udev
163 mandir = ${prefix}/usr/share/man
164 configdir = ${etcdir}/udev/
165
166diff -Naur udev-124.orig/extras/usb_id/Makefile udev-124/extras/usb_id/Makefile
167--- udev-124.orig/extras/usb_id/Makefile 2008-06-12 01:24:30.000000000 -0400
168+++ udev-124/extras/usb_id/Makefile 2008-06-28 15:00:33.581636223 -0400
169@@ -16,7 +16,7 @@
170 sbindir = ${prefix}/sbin
171 usrbindir = ${prefix}/usr/bin
172 usrsbindir = ${prefix}/usr/sbin
173-libudevdir = ${prefix}/lib/udev
174+libudevdir = ${prefix}/lib64/udev
175 mandir = ${prefix}/usr/share/man
176 configdir = ${etcdir}/udev/
177
178diff -Naur udev-124.orig/extras/volume_id/Makefile udev-124/extras/volume_id/Makefile
179--- udev-124.orig/extras/volume_id/Makefile 2008-06-12 01:24:30.000000000 -0400
180+++ udev-124/extras/volume_id/Makefile 2008-06-28 15:00:19.792848447 -0400
181@@ -14,7 +14,7 @@
182 sbindir = ${prefix}/sbin
183 usrbindir = ${prefix}/usr/bin
184 usrsbindir = ${prefix}/usr/sbin
185-libudevdir = ${prefix}/lib/udev
186+libudevdir = ${prefix}/lib64/udev
187 mandir = ${prefix}/usr/share/man
188 configdir = ${etcdir}/udev/
189
190diff -Naur udev-124.orig/Makefile udev-124/Makefile
191--- udev-124.orig/Makefile 2008-06-12 01:24:30.000000000 -0400
192+++ udev-124/Makefile 2008-06-28 14:58:52.953375683 -0400
193@@ -88,7 +88,7 @@
194 etcdir = ${prefix}/etc
195 sbindir = ${prefix}/sbin
196 usrbindir = ${prefix}/usr/bin
197-libudevdir = ${prefix}/lib/udev
198+libudevdir = ${prefix}/lib64/udev
199 mandir = ${prefix}/usr/share/man
200 configdir = ${etcdir}/udev
201 udevdir = /dev
202diff -Naur udev-124.orig/udev_rules.c udev-124/udev_rules.c
203--- udev-124.orig/udev_rules.c 2008-06-12 01:24:30.000000000 -0400
204+++ udev-124/udev_rules.c 2008-06-28 14:58:22.839575040 -0400
205@@ -172,9 +172,9 @@
206 }
207 }
208
209- /* allow programs in /lib/udev called without the path */
210+ /* allow programs in /lib64/udev called without the path */
211 if (strchr(argv[0], '/') == NULL) {
212- strlcpy(program, "/lib/udev/", sizeof(program));
213+ strlcpy(program, "/lib64/udev/", sizeof(program));
214 strlcat(program, argv[0], sizeof(program));
215 argv[0] = program;
216 }
217diff -Naur udev-124.orig/udev_rules_parse.c udev-124/udev_rules_parse.c
218--- udev-124.orig/udev_rules_parse.c 2008-06-12 01:24:30.000000000 -0400
219+++ udev-124/udev_rules_parse.c 2008-06-28 14:56:57.988495302 -0400
220@@ -447,9 +447,9 @@
221 if (pos)
222 pos[0] = '\0';
223
224- /* allow programs in /lib/udev called without the path */
225+ /* allow programs in /lib64/udev called without the path */
226 if (strchr(file, '/') == NULL) {
227- strlcpy(file, "/lib/udev/", sizeof(file));
228+ strlcpy(file, "/lib64/udev/", sizeof(file));
229 strlcat(file, value, sizeof(file));
230 pos = strchr(file, ' ');
231 if (pos)
Note: See TracBrowser for help on using the repository browser.