source: patches/udev-124-lib64-2.patch@ 75b570d

Last change on this file since 75b570d was 67300de, checked in by Joe Ciccone <jciccone@…>, 16 years ago

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