- Timestamp:
- Sep 3, 2007, 1:11:35 AM (17 years ago)
- Branches:
- clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
- Children:
- c13bac4
- Parents:
- 8731fd5
- File:
-
- 1 moved
-
patches/udev-115-lib64-1.patch (moved) (moved from patches/udev-105-lib64-1.patch) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
-
patches/udev-115-lib64-1.patch
r8731fd5 rfab693d 1 1 Submitted By: Jim Gifford <jim@linuxfromscratch.org> 2 Date: 200 6-09-162 Date: 2007-09-01 3 3 Upstream Status: Unknown 4 4 Origin: Jim Gifford 5 5 Description: Change /lib/udev to /lib64/udev 6 6 7 diff -Naur udev- 096.orig/extras/ata_id/Makefile udev-096/extras/ata_id/Makefile8 --- udev- 096.orig/extras/ata_id/Makefile 2006-07-09 12:48:19.000000000 -07009 +++ udev- 096/extras/ata_id/Makefile 2006-09-16 14:40:50.000000000 -070010 @@ -16,7 +16,7 @@ 11 sbindir = ${prefix}/sbin 12 usrbindir = ${prefix}/usr/bin 13 usrsbindir = ${prefix}/usr/sbin 14 -libudevdir = ${prefix}/lib/udev 15 +libudevdir = ${prefix}/lib64/udev 16 mandir = ${prefix}/usr/share/man 17 configdir = ${etcdir}/udev/ 18 19 diff -Naur udev- 096.orig/extras/cdrom_id/Makefile udev-096/extras/cdrom_id/Makefile20 --- udev- 096.orig/extras/cdrom_id/Makefile 2006-07-09 12:48:19.000000000 -070021 +++ udev- 096/extras/cdrom_id/Makefile 2006-09-16 14:40:50.000000000 -070022 @@ -16,7 +16,7 @@ 23 sbindir = ${prefix}/sbin 24 usrbindir = ${prefix}/usr/bin 25 usrsbindir = ${prefix}/usr/sbin 26 -libudevdir = ${prefix}/lib/udev 27 +libudevdir = ${prefix}/lib64/udev 28 mandir = ${prefix}/usr/share/man 29 configdir = ${etcdir}/udev /30 31 diff -Naur udev- 096.orig/extras/dasd_id/Makefile udev-096/extras/dasd_id/Makefile32 --- udev- 096.orig/extras/dasd_id/Makefile 2006-07-09 12:48:19.000000000 -070033 +++ udev- 096/extras/dasd_id/Makefile 2006-09-16 14:40:50.000000000 -070034 @@ -1 6,7 +16,7 @@35 sbindir = ${prefix}/sbin 36 usrbindir = ${prefix}/usr/bin 37 usrsbindir = ${prefix}/usr/sbin 38 -libudevdir = ${prefix}/lib/udev 39 +libudevdir = ${prefix}/lib64/udev 40 mandir = ${prefix}/usr/share/man 41 configdir = ${etcdir}/udev/ 42 43 diff -Naur udev- 096.orig/extras/edd_id/Makefile udev-096/extras/edd_id/Makefile44 --- udev- 096.orig/extras/edd_id/Makefile 2006-07-09 12:48:19.000000000 -070045 +++ udev- 096/extras/edd_id/Makefile 2006-09-16 14:40:50.000000000 -070046 @@ -16,7 +16,7 @@ 47 sbindir = ${prefix}/sbin 48 usrbindir = ${prefix}/usr/bin 49 usrsbindir = ${prefix}/usr/sbin 50 -libudevdir = ${prefix}/lib/udev 51 +libudevdir = ${prefix}/lib64/udev 52 mandir = ${prefix}/usr/share/man 53 configdir = ${etcdir}/udev/ 54 55 diff -Naur udev- 096.orig/extras/firmware/firmware.sh udev-096/extras/firmware/firmware.sh56 --- udev- 096.orig/extras/firmware/firmware.sh 2006-07-09 12:48:19.000000000 -070057 +++ udev- 096/extras/firmware/firmware.sh 2006-09-16 14:41:40.000000000 -07007 diff -Naur udev-115.orig/extras/ata_id/Makefile udev-115/extras/ata_id/Makefile 8 --- udev-115.orig/extras/ata_id/Makefile 2007-08-23 16:29:54.000000000 -0700 9 +++ udev-115/extras/ata_id/Makefile 2007-09-01 23:15:07.000000000 -0700 10 @@ -16,7 +16,7 @@ 11 sbindir = ${prefix}/sbin 12 usrbindir = ${prefix}/usr/bin 13 usrsbindir = ${prefix}/usr/sbin 14 -libudevdir = ${prefix}/lib/udev 15 +libudevdir = ${prefix}/lib64/udev 16 mandir = ${prefix}/usr/share/man 17 configdir = ${etcdir}/udev/ 18 19 diff -Naur udev-115.orig/extras/cdrom_id/Makefile udev-115/extras/cdrom_id/Makefile 20 --- udev-115.orig/extras/cdrom_id/Makefile 2007-08-23 16:29:54.000000000 -0700 21 +++ udev-115/extras/cdrom_id/Makefile 2007-09-01 23:15:07.000000000 -0700 22 @@ -16,7 +16,7 @@ 23 sbindir = ${prefix}/sbin 24 usrbindir = ${prefix}/usr/bin 25 usrsbindir = ${prefix}/usr/sbin 26 -libudevdir = ${prefix}/lib/udev 27 +libudevdir = ${prefix}/lib64/udev 28 mandir = ${prefix}/usr/share/man 29 configdir = ${etcdir}/udev 30 31 diff -Naur udev-115.orig/extras/collect/Makefile udev-115/extras/collect/Makefile 32 --- udev-115.orig/extras/collect/Makefile 2007-08-23 16:29:54.000000000 -0700 33 +++ udev-115/extras/collect/Makefile 2007-09-01 23:21:10.000000000 -0700 34 @@ -11,7 +11,7 @@ 35 sbindir = ${prefix}/sbin 36 usrbindir = ${prefix}/usr/bin 37 usrsbindir = ${prefix}/usr/sbin 38 -libudevdir = ${prefix}/lib/udev 39 +libudevdir = ${prefix}/lib64/udev 40 mandir = ${prefix}/usr/share/man 41 configdir = ${etcdir}/udev/ 42 43 diff -Naur udev-115.orig/extras/edd_id/Makefile udev-115/extras/edd_id/Makefile 44 --- udev-115.orig/extras/edd_id/Makefile 2007-08-23 16:29:54.000000000 -0700 45 +++ udev-115/extras/edd_id/Makefile 2007-09-01 23:15:07.000000000 -0700 46 @@ -16,7 +16,7 @@ 47 sbindir = ${prefix}/sbin 48 usrbindir = ${prefix}/usr/bin 49 usrsbindir = ${prefix}/usr/sbin 50 -libudevdir = ${prefix}/lib/udev 51 +libudevdir = ${prefix}/lib64/udev 52 mandir = ${prefix}/usr/share/man 53 configdir = ${etcdir}/udev/ 54 55 diff -Naur udev-115.orig/extras/firmware/firmware.sh udev-115/extras/firmware/firmware.sh 56 --- udev-115.orig/extras/firmware/firmware.sh 2007-08-23 16:29:54.000000000 -0700 57 +++ udev-115/extras/firmware/firmware.sh 2007-09-01 23:23:42.000000000 -0700 58 58 @@ -1,6 +1,6 @@ 59 59 #!/bin/sh -e … … 64 64 err() { 65 65 echo "$@" >&2 66 diff -Naur udev-096.orig/extras/firmware/Makefile udev-096/extras/firmware/Makefile 67 --- udev-096.orig/extras/firmware/Makefile 2006-07-09 12:48:19.000000000 -0700 68 +++ udev-096/extras/firmware/Makefile 2006-09-16 14:40:50.000000000 -0700 69 @@ -13,7 +13,7 @@ 70 sbindir = ${prefix}/sbin 71 usrbindir = ${prefix}/usr/bin 72 usrsbindir = ${prefix}/usr/sbin 73 -libudevdir = ${prefix}/lib/udev 74 +libudevdir = ${prefix}/lib64/udev 75 mandir = ${prefix}/usr/share/man 76 configdir = ${etcdir}/udev/ 77 78 diff -Naur udev-096.orig/extras/floppy/Makefile udev-096/extras/floppy/Makefile 79 --- udev-096.orig/extras/floppy/Makefile 2006-07-09 12:48:19.000000000 -0700 80 +++ udev-096/extras/floppy/Makefile 2006-09-16 14:40:50.000000000 -0700 81 @@ -16,7 +16,7 @@ 82 sbindir = ${prefix}/sbin 83 usrbindir = ${prefix}/usr/bin 84 usrsbindir = ${prefix}/usr/sbin 85 -libudevdir = ${prefix}/lib/udev 86 +libudevdir = ${prefix}/lib64/udev 87 mandir = ${prefix}/usr/share/man 88 configdir = ${etcdir}/udev/ 89 90 diff -Naur udev-096.orig/extras/path_id/Makefile udev-096/extras/path_id/Makefile 91 --- udev-096.orig/extras/path_id/Makefile 2006-07-09 12:48:19.000000000 -0700 92 +++ udev-096/extras/path_id/Makefile 2006-09-16 14:40:50.000000000 -0700 93 @@ -13,7 +13,7 @@ 94 sbindir = ${prefix}/sbin 95 usrbindir = ${prefix}/usr/bin 96 usrsbindir = ${prefix}/usr/sbin 97 -libudevdir = ${prefix}/lib/udev 98 +libudevdir = ${prefix}/lib64/udev 99 mandir = ${prefix}/usr/share/man 100 configdir = ${etcdir}/udev/ 101 102 diff -Naur udev-096.orig/extras/run_directory/Makefile udev-096/extras/run_directory/Makefile 103 --- udev-096.orig/extras/run_directory/Makefile 2006-07-09 12:48:19.000000000 -0700 104 +++ udev-096/extras/run_directory/Makefile 2006-09-16 14:40:50.000000000 -0700 105 @@ -15,7 +15,7 @@ 106 sbindir = ${prefix}/sbin 107 usrbindir = ${prefix}/usr/bin 108 usrsbindir = ${prefix}/usr/sbin 109 -libudevdir = ${prefix}/lib/udev 110 +libudevdir = ${prefix}/lib64/udev 111 mandir = ${prefix}/usr/share/man 112 configdir = ${etcdir}/udev/ 113 114 diff -Naur udev-096.orig/extras/scsi_id/Makefile udev-096/extras/scsi_id/Makefile 115 --- udev-096.orig/extras/scsi_id/Makefile 2006-07-09 12:48:19.000000000 -0700 116 +++ udev-096/extras/scsi_id/Makefile 2006-09-16 14:40:50.000000000 -0700 66 diff -Naur udev-115.orig/extras/firmware/Makefile udev-115/extras/firmware/Makefile 67 --- udev-115.orig/extras/firmware/Makefile 2007-08-23 16:29:54.000000000 -0700 68 +++ udev-115/extras/firmware/Makefile 2007-09-01 23:15:07.000000000 -0700 69 @@ -13,7 +13,7 @@ 70 sbindir = ${prefix}/sbin 71 usrbindir = ${prefix}/usr/bin 72 usrsbindir = ${prefix}/usr/sbin 73 -libudevdir = ${prefix}/lib/udev 74 +libudevdir = ${prefix}/lib64/udev 75 mandir = ${prefix}/usr/share/man 76 configdir = ${etcdir}/udev/ 77 78 diff -Naur udev-115.orig/extras/floppy/Makefile udev-115/extras/floppy/Makefile 79 --- udev-115.orig/extras/floppy/Makefile 2007-08-23 16:29:54.000000000 -0700 80 +++ udev-115/extras/floppy/Makefile 2007-09-01 23:15:07.000000000 -0700 81 @@ -16,7 +16,7 @@ 82 sbindir = ${prefix}/sbin 83 usrbindir = ${prefix}/usr/bin 84 usrsbindir = ${prefix}/usr/sbin 85 -libudevdir = ${prefix}/lib/udev 86 +libudevdir = ${prefix}/lib64/udev 87 mandir = ${prefix}/usr/share/man 88 configdir = ${etcdir}/udev/ 89 90 diff -Naur udev-115.orig/extras/path_id/Makefile udev-115/extras/path_id/Makefile 91 --- udev-115.orig/extras/path_id/Makefile 2007-08-23 16:29:54.000000000 -0700 92 +++ udev-115/extras/path_id/Makefile 2007-09-01 23:15:07.000000000 -0700 93 @@ -13,7 +13,7 @@ 94 sbindir = ${prefix}/sbin 95 usrbindir = ${prefix}/usr/bin 96 usrsbindir = ${prefix}/usr/sbin 97 -libudevdir = ${prefix}/lib/udev 98 +libudevdir = ${prefix}/lib64/udev 99 mandir = ${prefix}/usr/share/man 100 configdir = ${etcdir}/udev/ 101 102 diff -Naur udev-115.orig/extras/rule_generator/Makefile udev-115/extras/rule_generator/Makefile 103 --- udev-115.orig/extras/rule_generator/Makefile 2007-08-23 16:29:54.000000000 -0700 104 +++ udev-115/extras/rule_generator/Makefile 2007-09-01 23:15:07.000000000 -0700 105 @@ -13,7 +13,7 @@ 106 sbindir = ${prefix}/sbin 107 usrbindir = ${prefix}/usr/bin 108 usrsbindir = ${prefix}/usr/sbin 109 -libudevdir = ${prefix}/lib/udev 110 +libudevdir = ${prefix}/lib64/udev 111 mandir = ${prefix}/usr/share/man 112 configdir = ${etcdir}/udev 113 114 diff -Naur udev-115.orig/extras/rule_generator/write_cd_rules udev-115/extras/rule_generator/write_cd_rules 115 --- udev-115.orig/extras/rule_generator/write_cd_rules 2007-08-23 16:29:54.000000000 -0700 116 +++ udev-115/extras/rule_generator/write_cd_rules 2007-09-01 23:15:07.000000000 -0700 117 @@ -13,7 +13,7 @@ 118 119 RULES_FILE="/etc/udev/rules.d/70-persistent-cd.rules" 120 121 -. /lib/udev/rule_generator.functions 122 +. /lib64/udev/rule_generator.functions 123 124 find_next_available() { 125 raw_find_next_available "$(find_all_rules 'SYMLINK+=' "$1")" 126 diff -Naur udev-115.orig/extras/rule_generator/write_net_rules udev-115/extras/rule_generator/write_net_rules 127 --- udev-115.orig/extras/rule_generator/write_net_rules 2007-08-23 16:29:54.000000000 -0700 128 +++ udev-115/extras/rule_generator/write_net_rules 2007-09-01 23:15:07.000000000 -0700 129 @@ -18,7 +18,7 @@ 130 131 RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules' 132 133 -. /lib/udev/rule_generator.functions 134 +. /lib64/udev/rule_generator.functions 135 136 interface_name_taken() { 137 local value="$(find_all_rules 'NAME=' $INTERFACE)" 138 diff -Naur udev-115.orig/extras/scsi_id/Makefile udev-115/extras/scsi_id/Makefile 139 --- udev-115.orig/extras/scsi_id/Makefile 2007-08-23 16:29:54.000000000 -0700 140 +++ udev-115/extras/scsi_id/Makefile 2007-09-01 23:15:07.000000000 -0700 117 141 @@ -19,7 +19,7 @@ 118 142 sbindir = ${prefix}/sbin … … 124 148 configdir = ${etcdir}/udev/ 125 149 126 diff -Naur udev- 096.orig/extras/usb_id/Makefile udev-096/extras/usb_id/Makefile127 --- udev- 096.orig/extras/usb_id/Makefile 2006-07-09 12:48:19.000000000 -0700128 +++ udev- 096/extras/usb_id/Makefile 2006-09-16 14:40:50.000000000 -0700129 @@ -16,7 +16,7 @@ 130 sbindir = ${prefix}/sbin 131 usrbindir = ${prefix}/usr/bin 132 usrsbindir = ${prefix}/usr/sbin 133 -libudevdir = ${prefix}/lib/udev 134 +libudevdir = ${prefix}/lib64/udev 135 mandir = ${prefix}/usr/share/man 136 configdir = ${etcdir}/udev/ 137 138 diff -Naur udev- 096.orig/extras/volume_id/lib/Makefile udev-096/extras/volume_id/lib/Makefile139 --- udev- 096.orig/extras/volume_id/lib/Makefile 2006-07-09 12:48:19.000000000 -0700140 +++ udev- 096/extras/volume_id/lib/Makefile 2006-09-16 14:40:50.000000000 -0700150 diff -Naur udev-115.orig/extras/usb_id/Makefile udev-115/extras/usb_id/Makefile 151 --- udev-115.orig/extras/usb_id/Makefile 2007-08-23 16:29:54.000000000 -0700 152 +++ udev-115/extras/usb_id/Makefile 2007-09-01 23:15:07.000000000 -0700 153 @@ -16,7 +16,7 @@ 154 sbindir = ${prefix}/sbin 155 usrbindir = ${prefix}/usr/bin 156 usrsbindir = ${prefix}/usr/sbin 157 -libudevdir = ${prefix}/lib/udev 158 +libudevdir = ${prefix}/lib64/udev 159 mandir = ${prefix}/usr/share/man 160 configdir = ${etcdir}/udev/ 161 162 diff -Naur udev-115.orig/extras/volume_id/lib/Makefile udev-115/extras/volume_id/lib/Makefile 163 --- udev-115.orig/extras/volume_id/lib/Makefile 2007-08-23 16:29:54.000000000 -0700 164 +++ udev-115/extras/volume_id/lib/Makefile 2007-09-01 23:15:07.000000000 -0700 141 165 @@ -5,8 +5,8 @@ 142 166 # Released under the GNU General Public License, version 2. … … 148 172 +usrlibdir = ${prefix}/usr/lib64 149 173 150 INSTALL = /usr/bin/install -c174 INSTALL = install -c 151 175 INSTALL_DATA = ${INSTALL} -m 644 152 diff -Naur udev- 096.orig/extras/volume_id/Makefile udev-096/extras/volume_id/Makefile153 --- udev- 096.orig/extras/volume_id/Makefile 2006-07-09 12:48:19.000000000 -0700154 +++ udev- 096/extras/volume_id/Makefile 2006-09-16 14:40:50.000000000 -0700176 diff -Naur udev-115.orig/extras/volume_id/Makefile udev-115/extras/volume_id/Makefile 177 --- udev-115.orig/extras/volume_id/Makefile 2007-08-23 16:29:54.000000000 -0700 178 +++ udev-115/extras/volume_id/Makefile 2007-09-01 23:15:07.000000000 -0700 155 179 @@ -14,7 +14,7 @@ 156 180 sbindir = ${prefix}/sbin … … 162 186 configdir = ${etcdir}/udev/ 163 187 164 diff -Naur udev- 096.orig/Makefile udev-096/Makefile165 --- udev- 096.orig/Makefile 2006-07-09 12:48:19.000000000 -0700166 +++ udev- 096/Makefile 2006-09-16 14:40:50.000000000 -0700167 @@ -9 8,7 +98,7 @@188 diff -Naur udev-115.orig/Makefile udev-115/Makefile 189 --- udev-115.orig/Makefile 2007-08-23 16:29:54.000000000 -0700 190 +++ udev-115/Makefile 2007-09-01 23:15:07.000000000 -0700 191 @@ -94,7 +94,7 @@ 168 192 sbindir = ${prefix}/sbin 169 193 usrbindir = ${prefix}/usr/bin … … 174 198 configdir = ${etcdir}/udev 175 199 udevdir = /dev 176 diff -Naur udev-096.orig/udev_rules_parse.c udev-096/udev_rules_parse.c 177 --- udev-096.orig/udev_rules_parse.c 2006-07-09 12:48:19.000000000 -0700 178 +++ udev-096/udev_rules_parse.c 2006-09-16 14:40:50.000000000 -0700 179 @@ -396,9 +396,9 @@ 200 diff -Naur udev-115.orig/udev_rules.c udev-115/udev_rules.c 201 --- udev-115.orig/udev_rules.c 2007-08-23 16:29:54.000000000 -0700 202 +++ udev-115/udev_rules.c 2007-09-01 23:19:11.000000000 -0700 203 @@ -170,9 +170,9 @@ 204 } 205 } 206 207 - /* allow programs in /lib/udev called without the path */ 208 + /* allow programs in /lib64/udev called without the path */ 209 if (strchr(argv[0], '/') == NULL) { 210 - strlcpy(program, "/lib/udev/", sizeof(program)); 211 + strlcpy(program, "/lib64/udev/", sizeof(program)); 212 strlcat(program, argv[0], sizeof(program)); 213 argv[0] = program; 214 } 215 diff -Naur udev-115.orig/udev_rules_parse.c udev-115/udev_rules_parse.c 216 --- udev-115.orig/udev_rules_parse.c 2007-08-23 16:29:54.000000000 -0700 217 +++ udev-115/udev_rules_parse.c 2007-09-01 23:15:07.000000000 -0700 218 @@ -445,9 +445,9 @@ 180 219 if (pos) 181 220 pos[0] = '\0'; … … 189 228 pos = strchr(file, ' '); 190 229 if (pos) 191 diff -Naur udev-096.orig/udev_utils_run.c udev-096/udev_utils_run.c192 --- udev-096.orig/udev_utils_run.c 2006-07-09 12:48:19.000000000 -0700193 +++ udev-096/udev_utils_run.c 2006-09-16 14:40:50.000000000 -0700194 @@ -124,9 +124,9 @@195 }196 }197 198 - /* allow programs in /lib/udev called without the path */199 + /* allow programs in /lib64/udev called without the path */200 if (strchr(argv[0], '/') == NULL) {201 - strlcpy(program, "/lib/udev/", sizeof(program));202 + strlcpy(program, "/lib64/udev/", sizeof(program));203 strlcat(program, argv[0], sizeof(program));204 argv[0] = program;205 }
Note: See TracChangeset
for help on using the changeset viewer.
