[2c088b4] | 1 | Submitted By: Joe Gifford <jim@linuxfromscratch.org>
|
---|
| 2 | Date: 2006-09-05
|
---|
| 3 | Upstream Status: Unknown
|
---|
| 4 | Origin: Jim Gifford
|
---|
| 5 | Description: Change /lib/udev to /lib64/udev
|
---|
| 6 |
|
---|
| 7 | diff -Naur udev-098.orig/Makefile udev-098/Makefile
|
---|
| 8 | --- udev-098.orig/Makefile 2006-08-22 16:32:25.000000000 -0700
|
---|
| 9 | +++ udev-098/Makefile 2006-09-05 11:09:28.984721185 -0700
|
---|
| 10 | @@ -96,7 +96,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 | udevdir = /dev
|
---|
| 19 | diff -Naur udev-098.orig/extras/ata_id/Makefile udev-098/extras/ata_id/Makefile
|
---|
| 20 | --- udev-098.orig/extras/ata_id/Makefile 2006-08-22 16:32:25.000000000 -0700
|
---|
| 21 | +++ udev-098/extras/ata_id/Makefile 2006-09-05 11:09:28.984721185 -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-098.orig/extras/cdrom_id/Makefile udev-098/extras/cdrom_id/Makefile
|
---|
| 32 | --- udev-098.orig/extras/cdrom_id/Makefile 2006-08-22 16:32:25.000000000 -0700
|
---|
| 33 | +++ udev-098/extras/cdrom_id/Makefile 2006-09-05 11:09:28.988721081 -0700
|
---|
| 34 | @@ -16,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-098.orig/extras/dasd_id/Makefile udev-098/extras/dasd_id/Makefile
|
---|
| 44 | --- udev-098.orig/extras/dasd_id/Makefile 2006-08-22 16:32:25.000000000 -0700
|
---|
| 45 | +++ udev-098/extras/dasd_id/Makefile 2006-09-05 11:09:28.988721081 -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-098.orig/extras/edd_id/Makefile udev-098/extras/edd_id/Makefile
|
---|
| 56 | --- udev-098.orig/extras/edd_id/Makefile 2006-08-22 16:32:25.000000000 -0700
|
---|
| 57 | +++ udev-098/extras/edd_id/Makefile 2006-09-05 11:09:28.992720977 -0700
|
---|
| 58 | @@ -16,7 +16,7 @@
|
---|
| 59 | sbindir = ${prefix}/sbin
|
---|
| 60 | usrbindir = ${prefix}/usr/bin
|
---|
| 61 | usrsbindir = ${prefix}/usr/sbin
|
---|
| 62 | -libudevdir = ${prefix}/lib/udev
|
---|
| 63 | +libudevdir = ${prefix}/lib64/udev
|
---|
| 64 | mandir = ${prefix}/usr/share/man
|
---|
| 65 | configdir = ${etcdir}/udev/
|
---|
| 66 |
|
---|
| 67 | diff -Naur udev-098.orig/extras/firmware/Makefile udev-098/extras/firmware/Makefile
|
---|
| 68 | --- udev-098.orig/extras/firmware/Makefile 2006-08-22 16:32:25.000000000 -0700
|
---|
| 69 | +++ udev-098/extras/firmware/Makefile 2006-09-05 11:09:28.992720977 -0700
|
---|
| 70 | @@ -13,7 +13,7 @@
|
---|
| 71 | sbindir = ${prefix}/sbin
|
---|
| 72 | usrbindir = ${prefix}/usr/bin
|
---|
| 73 | usrsbindir = ${prefix}/usr/sbin
|
---|
| 74 | -libudevdir = ${prefix}/lib/udev
|
---|
| 75 | +libudevdir = ${prefix}/lib64/udev
|
---|
| 76 | mandir = ${prefix}/usr/share/man
|
---|
| 77 | configdir = ${etcdir}/udev/
|
---|
| 78 |
|
---|
| 79 | diff -Naur udev-098.orig/extras/floppy/Makefile udev-098/extras/floppy/Makefile
|
---|
| 80 | --- udev-098.orig/extras/floppy/Makefile 2006-08-22 16:32:25.000000000 -0700
|
---|
| 81 | +++ udev-098/extras/floppy/Makefile 2006-09-05 11:09:28.996720872 -0700
|
---|
| 82 | @@ -16,7 +16,7 @@
|
---|
| 83 | sbindir = ${prefix}/sbin
|
---|
| 84 | usrbindir = ${prefix}/usr/bin
|
---|
| 85 | usrsbindir = ${prefix}/usr/sbin
|
---|
| 86 | -libudevdir = ${prefix}/lib/udev
|
---|
| 87 | +libudevdir = ${prefix}/lib64/udev
|
---|
| 88 | mandir = ${prefix}/usr/share/man
|
---|
| 89 | configdir = ${etcdir}/udev/
|
---|
| 90 |
|
---|
| 91 | diff -Naur udev-098.orig/extras/path_id/Makefile udev-098/extras/path_id/Makefile
|
---|
| 92 | --- udev-098.orig/extras/path_id/Makefile 2006-08-22 16:32:25.000000000 -0700
|
---|
| 93 | +++ udev-098/extras/path_id/Makefile 2006-09-05 11:09:28.996720872 -0700
|
---|
| 94 | @@ -13,7 +13,7 @@
|
---|
| 95 | sbindir = ${prefix}/sbin
|
---|
| 96 | usrbindir = ${prefix}/usr/bin
|
---|
| 97 | usrsbindir = ${prefix}/usr/sbin
|
---|
| 98 | -libudevdir = ${prefix}/lib/udev
|
---|
| 99 | +libudevdir = ${prefix}/lib64/udev
|
---|
| 100 | mandir = ${prefix}/usr/share/man
|
---|
| 101 | configdir = ${etcdir}/udev/
|
---|
| 102 |
|
---|
| 103 | diff -Naur udev-098.orig/extras/run_directory/Makefile udev-098/extras/run_directory/Makefile
|
---|
| 104 | --- udev-098.orig/extras/run_directory/Makefile 2006-08-22 16:32:25.000000000 -0700
|
---|
| 105 | +++ udev-098/extras/run_directory/Makefile 2006-09-05 11:09:29.000720768 -0700
|
---|
| 106 | @@ -15,7 +15,7 @@
|
---|
| 107 | sbindir = ${prefix}/sbin
|
---|
| 108 | usrbindir = ${prefix}/usr/bin
|
---|
| 109 | usrsbindir = ${prefix}/usr/sbin
|
---|
| 110 | -libudevdir = ${prefix}/lib/udev
|
---|
| 111 | +libudevdir = ${prefix}/lib64/udev
|
---|
| 112 | mandir = ${prefix}/usr/share/man
|
---|
| 113 | configdir = ${etcdir}/udev/
|
---|
| 114 |
|
---|
| 115 | diff -Naur udev-098.orig/extras/scsi_id/Makefile udev-098/extras/scsi_id/Makefile
|
---|
| 116 | --- udev-098.orig/extras/scsi_id/Makefile 2006-08-22 16:32:25.000000000 -0700
|
---|
| 117 | +++ udev-098/extras/scsi_id/Makefile 2006-09-05 11:09:29.004720664 -0700
|
---|
| 118 | @@ -19,7 +19,7 @@
|
---|
| 119 | sbindir = ${prefix}/sbin
|
---|
| 120 | usrbindir = ${prefix}/usr/bin
|
---|
| 121 | usrsbindir = ${prefix}/usr/sbin
|
---|
| 122 | -libudevdir = ${prefix}/lib/udev
|
---|
| 123 | +libudevdir = ${prefix}/lib64/udev
|
---|
| 124 | mandir = ${prefix}/usr/share/man
|
---|
| 125 | configdir = ${etcdir}/udev/
|
---|
| 126 |
|
---|
| 127 | diff -Naur udev-098.orig/extras/usb_id/Makefile udev-098/extras/usb_id/Makefile
|
---|
| 128 | --- udev-098.orig/extras/usb_id/Makefile 2006-08-22 16:32:25.000000000 -0700
|
---|
| 129 | +++ udev-098/extras/usb_id/Makefile 2006-09-05 11:09:29.004720664 -0700
|
---|
| 130 | @@ -16,7 +16,7 @@
|
---|
| 131 | sbindir = ${prefix}/sbin
|
---|
| 132 | usrbindir = ${prefix}/usr/bin
|
---|
| 133 | usrsbindir = ${prefix}/usr/sbin
|
---|
| 134 | -libudevdir = ${prefix}/lib/udev
|
---|
| 135 | +libudevdir = ${prefix}/lib64/udev
|
---|
| 136 | mandir = ${prefix}/usr/share/man
|
---|
| 137 | configdir = ${etcdir}/udev/
|
---|
| 138 |
|
---|
| 139 | diff -Naur udev-098.orig/extras/volume_id/Makefile udev-098/extras/volume_id/Makefile
|
---|
| 140 | --- udev-098.orig/extras/volume_id/Makefile 2006-08-22 16:32:25.000000000 -0700
|
---|
| 141 | +++ udev-098/extras/volume_id/Makefile 2006-09-05 11:09:29.008720559 -0700
|
---|
| 142 | @@ -14,7 +14,7 @@
|
---|
| 143 | sbindir = ${prefix}/sbin
|
---|
| 144 | usrbindir = ${prefix}/usr/bin
|
---|
| 145 | usrsbindir = ${prefix}/usr/sbin
|
---|
| 146 | -libudevdir = ${prefix}/lib/udev
|
---|
| 147 | +libudevdir = ${prefix}/lib64/udev
|
---|
| 148 | mandir = ${prefix}/usr/share/man
|
---|
| 149 | configdir = ${etcdir}/udev/
|
---|
| 150 |
|
---|
| 151 | diff -Naur udev-098.orig/extras/volume_id/lib/Makefile udev-098/extras/volume_id/lib/Makefile
|
---|
| 152 | --- udev-098.orig/extras/volume_id/lib/Makefile 2006-08-22 16:32:25.000000000 -0700
|
---|
| 153 | +++ udev-098/extras/volume_id/lib/Makefile 2006-09-05 11:09:29.008720559 -0700
|
---|
| 154 | @@ -5,8 +5,8 @@
|
---|
| 155 | # Released under the GNU General Public License, version 2.
|
---|
| 156 | #
|
---|
| 157 | includedir = ${prefix}/usr/include
|
---|
| 158 | -libdir = ${prefix}/lib
|
---|
| 159 | -usrlibdir = ${prefix}/usr/lib
|
---|
| 160 | +libdir = ${prefix}/lib64
|
---|
| 161 | +usrlibdir = ${prefix}/usr/lib64
|
---|
| 162 |
|
---|
| 163 | INSTALL = /usr/bin/install -c
|
---|
| 164 | INSTALL_DATA = ${INSTALL} -m 644
|
---|
| 165 | diff -Naur udev-098.orig/udev_rules_parse.c udev-098/udev_rules_parse.c
|
---|
| 166 | --- udev-098.orig/udev_rules_parse.c 2006-08-22 16:32:25.000000000 -0700
|
---|
| 167 | +++ udev-098/udev_rules_parse.c 2006-09-05 11:12:24.532142387 -0700
|
---|
| 168 | @@ -432,9 +432,9 @@
|
---|
| 169 | if (pos)
|
---|
| 170 | pos[0] = '\0';
|
---|
| 171 |
|
---|
| 172 | - /* allow programs in /lib/udev called without the path */
|
---|
| 173 | + /* allow programs in /lib64/udev called without the path */
|
---|
| 174 | if (strchr(file, '/') == NULL) {
|
---|
| 175 | - strlcpy(file, "/lib/udev/", sizeof(file));
|
---|
| 176 | + strlcpy(file, "/lib64/udev/", sizeof(file));
|
---|
| 177 | strlcat(file, value, sizeof(file));
|
---|
| 178 | pos = strchr(file, ' ');
|
---|
| 179 | if (pos)
|
---|
| 180 | diff -Naur udev-098.orig/udev_utils_run.c udev-098/udev_utils_run.c
|
---|
| 181 | --- udev-098.orig/udev_utils_run.c 2006-08-22 16:32:25.000000000 -0700
|
---|
| 182 | +++ udev-098/udev_utils_run.c 2006-09-05 11:09:32.512629158 -0700
|
---|
| 183 | @@ -124,9 +124,9 @@
|
---|
| 184 | }
|
---|
| 185 | }
|
---|
| 186 |
|
---|
| 187 | - /* allow programs in /lib/udev called without the path */
|
---|
| 188 | + /* allow programs in /lib64/udev called without the path */
|
---|
| 189 | if (strchr(argv[0], '/') == NULL) {
|
---|
| 190 | - strlcpy(program, "/lib/udev/", sizeof(program));
|
---|
| 191 | + strlcpy(program, "/lib64/udev/", sizeof(program));
|
---|
| 192 | strlcat(program, argv[0], sizeof(program));
|
---|
| 193 | argv[0] = program;
|
---|
| 194 | }
|
---|