Changeset 2271acc


Ignore:
Timestamp:
Sep 25, 2006, 8:36:47 PM (18 years ago)
Author:
Jim Gifford <clfs@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
d9f6c44
Parents:
023eb64
Message:

Updated udev patch

File:
1 moved

Legend:

Unmodified
Added
Removed
  • patches/udev-100-lib64-1.patch

    r023eb64 r2271acc  
    1 Submitted By: Joe Gifford <jim@linuxfromscratch.org>
    2 Date: 2006-09-05
     1Submitted By: Jim Gifford <jim@linuxfromscratch.org>
     2Date: 2006-09-16
    33Upstream Status: Unknown
    44Origin: Jim Gifford
    55Description: Change /lib/udev to /lib64/udev
    66
    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
     7diff -Naur udev-096.orig/extras/ata_id/Makefile udev-096/extras/ata_id/Makefile
     8--- udev-096.orig/extras/ata_id/Makefile        2006-07-09 12:48:19.000000000 -0700
     9+++ udev-096/extras/ata_id/Makefile     2006-09-16 14:40:50.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 
     19diff -Naur udev-096.orig/extras/cdrom_id/Makefile udev-096/extras/cdrom_id/Makefile
     20--- udev-096.orig/extras/cdrom_id/Makefile      2006-07-09 12:48:19.000000000 -0700
     21+++ udev-096/extras/cdrom_id/Makefile   2006-09-16 14:40:50.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 
     31diff -Naur udev-096.orig/extras/dasd_id/Makefile udev-096/extras/dasd_id/Makefile
     32--- udev-096.orig/extras/dasd_id/Makefile       2006-07-09 12:48:19.000000000 -0700
     33+++ udev-096/extras/dasd_id/Makefile    2006-09-16 14:40:50.000000000 -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 
     43diff -Naur udev-096.orig/extras/edd_id/Makefile udev-096/extras/edd_id/Makefile
     44--- udev-096.orig/extras/edd_id/Makefile        2006-07-09 12:48:19.000000000 -0700
     45+++ udev-096/extras/edd_id/Makefile     2006-09-16 14:40:50.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 
     55diff -Naur udev-096.orig/extras/firmware/firmware.sh udev-096/extras/firmware/firmware.sh
     56--- udev-096.orig/extras/firmware/firmware.sh   2006-07-09 12:48:19.000000000 -0700
     57+++ udev-096/extras/firmware/firmware.sh        2006-09-16 14:41:40.000000000 -0700
     58@@ -1,6 +1,6 @@
     59 #!/bin/sh -e
     60 
     61-FIRMWARE_DIRS="/lib/firmware /usr/local/lib/firmware"
     62+FIRMWARE_DIRS="/lib64/firmware /usr/local/lib64/firmware"
     63 
     64 err() {
     65     echo "$@" >&2
     66diff -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
    7069@@ -13,7 +13,7 @@
    7170 sbindir =      ${prefix}/sbin
     
    7776 configdir =    ${etcdir}/udev/
    7877 
    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
     78diff -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 
     90diff -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
    9493@@ -13,7 +13,7 @@
    9594 sbindir =      ${prefix}/sbin
     
    101100 configdir =    ${etcdir}/udev/
    102101 
    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
     102diff -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
    106105@@ -15,7 +15,7 @@
    107106 sbindir =      ${prefix}/sbin
     
    113112 configdir =    ${etcdir}/udev/
    114113 
    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
     114diff -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
    118117@@ -19,7 +19,7 @@
    119118 sbindir =      ${prefix}/sbin
     
    125124 configdir =    ${etcdir}/udev/
    126125 
    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
     126diff -Naur udev-096.orig/extras/usb_id/Makefile udev-096/extras/usb_id/Makefile
     127--- udev-096.orig/extras/usb_id/Makefile        2006-07-09 12:48:19.000000000 -0700
     128+++ udev-096/extras/usb_id/Makefile     2006-09-16 14:40:50.000000000 -0700
     129@@ -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 
     138diff -Naur udev-096.orig/extras/volume_id/lib/Makefile udev-096/extras/volume_id/lib/Makefile
     139--- udev-096.orig/extras/volume_id/lib/Makefile 2006-07-09 12:48:19.000000000 -0700
     140+++ udev-096/extras/volume_id/lib/Makefile      2006-09-16 14:40:50.000000000 -0700
    154141@@ -5,8 +5,8 @@
    155142 # Released under the GNU General Public License, version 2.
     
    163150 INSTALL = /usr/bin/install -c
    164151 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 @@
     152diff -Naur udev-096.orig/extras/volume_id/Makefile udev-096/extras/volume_id/Makefile
     153--- udev-096.orig/extras/volume_id/Makefile     2006-07-09 12:48:19.000000000 -0700
     154+++ udev-096/extras/volume_id/Makefile  2006-09-16 14:40:50.000000000 -0700
     155@@ -14,7 +14,7 @@
     156 sbindir =      ${prefix}/sbin
     157 usrbindir =    ${prefix}/usr/bin
     158 usrsbindir =   ${prefix}/usr/sbin
     159-libudevdir =   ${prefix}/lib/udev
     160+libudevdir =   ${prefix}/lib64/udev
     161 mandir =       ${prefix}/usr/share/man
     162 configdir =    ${etcdir}/udev/
     163 
     164diff -Naur udev-096.orig/Makefile udev-096/Makefile
     165--- udev-096.orig/Makefile      2006-07-09 12:48:19.000000000 -0700
     166+++ udev-096/Makefile   2006-09-16 14:40:50.000000000 -0700
     167@@ -98,7 +98,7 @@
     168 sbindir =      ${prefix}/sbin
     169 usrbindir =    ${prefix}/usr/bin
     170 usrsbindir =   ${prefix}/usr/sbin
     171-libudevdir =   ${prefix}/lib/udev
     172+libudevdir =   ${prefix}/lib64/udev
     173 mandir =       ${prefix}/usr/share/man
     174 configdir =    ${etcdir}/udev
     175 udevdir =      /dev
     176diff -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 @@
    169180                                if (pos)
    170181                                        pos[0] = '\0';
     
    178189                                        pos = strchr(file, ' ');
    179190                                        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
     191diff -Naur udev-096.orig/udev_utils_run.c udev-096/udev_utils_run.c
     192--- udev-096.orig/udev_utils_run.c      2006-07-09 12:48:19.000000000 -0700
     193+++ udev-096/udev_utils_run.c   2006-09-16 14:40:50.000000000 -0700
    183194@@ -124,9 +124,9 @@
    184195                }
Note: See TracChangeset for help on using the changeset viewer.