Changeset 2271acc

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:

• patches/udev-100-lib64-1.patch (moved) (moved from patches/udev-098-lib64-1.patch ) (7 diffs)

patches/udev-100-lib64-1.patch

@@ -1 @@
-Submitted By: Joe Gifford <jim@linuxfromscratch.org>
-Date: 2006-09-05
+Submitted By: Jim Gifford <jim@linuxfromscratch.org>
+Date: 2006-09-16
 Upstream Status: Unknown
 Origin: Jim Gifford
 Description: Change /lib/udev to /lib64/udev
 
-diff -Naur udev-098.orig/Makefile udev-098/Makefile
---- udev-098.orig/Makefile      2006-08-22 16:32:25.000000000 -0700
-+++ udev-098/Makefile   2006-09-05 11:09:28.984721185 -0700
-@@ -96,7 +96,7 @@
- sbindir =      ${prefix}/sbin
- usrbindir =    ${prefix}/usr/bin
- usrsbindir =   ${prefix}/usr/sbin
--libudevdir =   ${prefix}/lib/udev
-+libudevdir =   ${prefix}/lib64/udev
- mandir =       ${prefix}/usr/share/man
- configdir =    ${etcdir}/udev
- udevdir =      /dev
-diff -Naur udev-098.orig/extras/ata_id/Makefile udev-098/extras/ata_id/Makefile
---- udev-098.orig/extras/ata_id/Makefile        2006-08-22 16:32:25.000000000 -0700
-+++ udev-098/extras/ata_id/Makefile     2006-09-05 11:09:28.984721185 -0700
-@@ -16,7 +16,7 @@
- sbindir =      ${prefix}/sbin
- usrbindir =    ${prefix}/usr/bin
- usrsbindir =   ${prefix}/usr/sbin
--libudevdir =   ${prefix}/lib/udev
-+libudevdir =   ${prefix}/lib64/udev
- mandir =       ${prefix}/usr/share/man
- configdir =    ${etcdir}/udev/
- 
-diff -Naur udev-098.orig/extras/cdrom_id/Makefile udev-098/extras/cdrom_id/Makefile
---- udev-098.orig/extras/cdrom_id/Makefile      2006-08-22 16:32:25.000000000 -0700
-+++ udev-098/extras/cdrom_id/Makefile   2006-09-05 11:09:28.988721081 -0700
-@@ -16,7 +16,7 @@
- sbindir =      ${prefix}/sbin
- usrbindir =    ${prefix}/usr/bin
- usrsbindir =   ${prefix}/usr/sbin
--libudevdir =   ${prefix}/lib/udev
-+libudevdir =   ${prefix}/lib64/udev
- mandir =       ${prefix}/usr/share/man
- configdir =    ${etcdir}/udev/
- 
-diff -Naur udev-098.orig/extras/dasd_id/Makefile udev-098/extras/dasd_id/Makefile
---- udev-098.orig/extras/dasd_id/Makefile       2006-08-22 16:32:25.000000000 -0700
-+++ udev-098/extras/dasd_id/Makefile    2006-09-05 11:09:28.988721081 -0700
-@@ -16,7 +16,7 @@
- sbindir =      ${prefix}/sbin
- usrbindir =    ${prefix}/usr/bin
- usrsbindir =   ${prefix}/usr/sbin
--libudevdir =   ${prefix}/lib/udev
-+libudevdir =   ${prefix}/lib64/udev
- mandir =       ${prefix}/usr/share/man
- configdir =    ${etcdir}/udev/
- 
-diff -Naur udev-098.orig/extras/edd_id/Makefile udev-098/extras/edd_id/Makefile
---- udev-098.orig/extras/edd_id/Makefile        2006-08-22 16:32:25.000000000 -0700
-+++ udev-098/extras/edd_id/Makefile     2006-09-05 11:09:28.992720977 -0700
-@@ -16,7 +16,7 @@
- sbindir =      ${prefix}/sbin
- usrbindir =    ${prefix}/usr/bin
- usrsbindir =   ${prefix}/usr/sbin
--libudevdir =   ${prefix}/lib/udev
-+libudevdir =   ${prefix}/lib64/udev
- mandir =       ${prefix}/usr/share/man
- configdir =    ${etcdir}/udev/
- 
-diff -Naur udev-098.orig/extras/firmware/Makefile udev-098/extras/firmware/Makefile
---- udev-098.orig/extras/firmware/Makefile      2006-08-22 16:32:25.000000000 -0700
-+++ udev-098/extras/firmware/Makefile   2006-09-05 11:09:28.992720977 -0700
+diff -Naur udev-096.orig/extras/ata_id/Makefile udev-096/extras/ata_id/Makefile
+--- udev-096.orig/extras/ata_id/Makefile        2006-07-09 12:48:19.000000000 -0700
++++ udev-096/extras/ata_id/Makefile     2006-09-16 14:40:50.000000000 -0700
+@@ -16,7 +16,7 @@
+ sbindir =      ${prefix}/sbin
+ usrbindir =    ${prefix}/usr/bin
+ usrsbindir =   ${prefix}/usr/sbin
+-libudevdir =   ${prefix}/lib/udev
++libudevdir =   ${prefix}/lib64/udev
+ mandir =       ${prefix}/usr/share/man
+ configdir =    ${etcdir}/udev/
+ 
+diff -Naur udev-096.orig/extras/cdrom_id/Makefile udev-096/extras/cdrom_id/Makefile
+--- udev-096.orig/extras/cdrom_id/Makefile      2006-07-09 12:48:19.000000000 -0700
++++ udev-096/extras/cdrom_id/Makefile   2006-09-16 14:40:50.000000000 -0700
+@@ -16,7 +16,7 @@
+ sbindir =      ${prefix}/sbin
+ usrbindir =    ${prefix}/usr/bin
+ usrsbindir =   ${prefix}/usr/sbin
+-libudevdir =   ${prefix}/lib/udev
++libudevdir =   ${prefix}/lib64/udev
+ mandir =       ${prefix}/usr/share/man
+ configdir =    ${etcdir}/udev/
+ 
+diff -Naur udev-096.orig/extras/dasd_id/Makefile udev-096/extras/dasd_id/Makefile
+--- udev-096.orig/extras/dasd_id/Makefile       2006-07-09 12:48:19.000000000 -0700
++++ udev-096/extras/dasd_id/Makefile    2006-09-16 14:40:50.000000000 -0700
+@@ -16,7 +16,7 @@
+ sbindir =      ${prefix}/sbin
+ usrbindir =    ${prefix}/usr/bin
+ usrsbindir =   ${prefix}/usr/sbin
+-libudevdir =   ${prefix}/lib/udev
++libudevdir =   ${prefix}/lib64/udev
+ mandir =       ${prefix}/usr/share/man
+ configdir =    ${etcdir}/udev/
+ 
+diff -Naur udev-096.orig/extras/edd_id/Makefile udev-096/extras/edd_id/Makefile
+--- udev-096.orig/extras/edd_id/Makefile        2006-07-09 12:48:19.000000000 -0700
++++ udev-096/extras/edd_id/Makefile     2006-09-16 14:40:50.000000000 -0700
+@@ -16,7 +16,7 @@
+ sbindir =      ${prefix}/sbin
+ usrbindir =    ${prefix}/usr/bin
+ usrsbindir =   ${prefix}/usr/sbin
+-libudevdir =   ${prefix}/lib/udev
++libudevdir =   ${prefix}/lib64/udev
+ mandir =       ${prefix}/usr/share/man
+ configdir =    ${etcdir}/udev/
+ 
+diff -Naur udev-096.orig/extras/firmware/firmware.sh udev-096/extras/firmware/firmware.sh
+--- udev-096.orig/extras/firmware/firmware.sh   2006-07-09 12:48:19.000000000 -0700
++++ udev-096/extras/firmware/firmware.sh        2006-09-16 14:41:40.000000000 -0700
+@@ -1,6 +1,6 @@
+ #!/bin/sh -e
+ 
+-FIRMWARE_DIRS="/lib/firmware /usr/local/lib/firmware"
++FIRMWARE_DIRS="/lib64/firmware /usr/local/lib64/firmware"
+ 
+ err() {
+     echo "$@" >&2
+diff -Naur udev-096.orig/extras/firmware/Makefile udev-096/extras/firmware/Makefile
+--- udev-096.orig/extras/firmware/Makefile      2006-07-09 12:48:19.000000000 -0700
++++ udev-096/extras/firmware/Makefile   2006-09-16 14:40:50.000000000 -0700
 @@ -13,7 +13,7 @@
  sbindir =      ${prefix}/sbin
@@ -77 +76 @@
  configdir =    ${etcdir}/udev/
  
-diff -Naur udev-098.orig/extras/floppy/Makefile udev-098/extras/floppy/Makefile
---- udev-098.orig/extras/floppy/Makefile        2006-08-22 16:32:25.000000000 -0700
-+++ udev-098/extras/floppy/Makefile     2006-09-05 11:09:28.996720872 -0700
-@@ -16,7 +16,7 @@
- sbindir =      ${prefix}/sbin
- usrbindir =    ${prefix}/usr/bin
- usrsbindir =   ${prefix}/usr/sbin
--libudevdir =   ${prefix}/lib/udev
-+libudevdir =   ${prefix}/lib64/udev
- mandir =       ${prefix}/usr/share/man
- configdir =    ${etcdir}/udev/
- 
-diff -Naur udev-098.orig/extras/path_id/Makefile udev-098/extras/path_id/Makefile
---- udev-098.orig/extras/path_id/Makefile       2006-08-22 16:32:25.000000000 -0700
-+++ udev-098/extras/path_id/Makefile    2006-09-05 11:09:28.996720872 -0700
+diff -Naur udev-096.orig/extras/floppy/Makefile udev-096/extras/floppy/Makefile
+--- udev-096.orig/extras/floppy/Makefile        2006-07-09 12:48:19.000000000 -0700
++++ udev-096/extras/floppy/Makefile     2006-09-16 14:40:50.000000000 -0700
+@@ -16,7 +16,7 @@
+ sbindir =      ${prefix}/sbin
+ usrbindir =    ${prefix}/usr/bin
+ usrsbindir =   ${prefix}/usr/sbin
+-libudevdir =   ${prefix}/lib/udev
++libudevdir =   ${prefix}/lib64/udev
+ mandir =       ${prefix}/usr/share/man
+ configdir =    ${etcdir}/udev/
+ 
+diff -Naur udev-096.orig/extras/path_id/Makefile udev-096/extras/path_id/Makefile
+--- udev-096.orig/extras/path_id/Makefile       2006-07-09 12:48:19.000000000 -0700
++++ udev-096/extras/path_id/Makefile    2006-09-16 14:40:50.000000000 -0700
 @@ -13,7 +13,7 @@
  sbindir =      ${prefix}/sbin
@@ -101 +100 @@
  configdir =    ${etcdir}/udev/
  
-diff -Naur udev-098.orig/extras/run_directory/Makefile udev-098/extras/run_directory/Makefile
---- udev-098.orig/extras/run_directory/Makefile 2006-08-22 16:32:25.000000000 -0700
-+++ udev-098/extras/run_directory/Makefile      2006-09-05 11:09:29.000720768 -0700
+diff -Naur udev-096.orig/extras/run_directory/Makefile udev-096/extras/run_directory/Makefile
+--- udev-096.orig/extras/run_directory/Makefile 2006-07-09 12:48:19.000000000 -0700
++++ udev-096/extras/run_directory/Makefile      2006-09-16 14:40:50.000000000 -0700
 @@ -15,7 +15,7 @@
  sbindir =      ${prefix}/sbin
@@ -113 +112 @@
  configdir =    ${etcdir}/udev/
  
-diff -Naur udev-098.orig/extras/scsi_id/Makefile udev-098/extras/scsi_id/Makefile
---- udev-098.orig/extras/scsi_id/Makefile       2006-08-22 16:32:25.000000000 -0700
-+++ udev-098/extras/scsi_id/Makefile    2006-09-05 11:09:29.004720664 -0700
+diff -Naur udev-096.orig/extras/scsi_id/Makefile udev-096/extras/scsi_id/Makefile
+--- udev-096.orig/extras/scsi_id/Makefile       2006-07-09 12:48:19.000000000 -0700
++++ udev-096/extras/scsi_id/Makefile    2006-09-16 14:40:50.000000000 -0700
 @@ -19,7 +19,7 @@
  sbindir =      ${prefix}/sbin
@@ -125 +124 @@
  configdir =    ${etcdir}/udev/
  
-diff -Naur udev-098.orig/extras/usb_id/Makefile udev-098/extras/usb_id/Makefile
---- udev-098.orig/extras/usb_id/Makefile        2006-08-22 16:32:25.000000000 -0700
-+++ udev-098/extras/usb_id/Makefile     2006-09-05 11:09:29.004720664 -0700
-@@ -16,7 +16,7 @@
- sbindir =      ${prefix}/sbin
- usrbindir =    ${prefix}/usr/bin
- usrsbindir =   ${prefix}/usr/sbin
--libudevdir =   ${prefix}/lib/udev
-+libudevdir =   ${prefix}/lib64/udev
- mandir =       ${prefix}/usr/share/man
- configdir =    ${etcdir}/udev/
- 
-diff -Naur udev-098.orig/extras/volume_id/Makefile udev-098/extras/volume_id/Makefile
---- udev-098.orig/extras/volume_id/Makefile     2006-08-22 16:32:25.000000000 -0700
-+++ udev-098/extras/volume_id/Makefile  2006-09-05 11:09:29.008720559 -0700
-@@ -14,7 +14,7 @@
- sbindir =      ${prefix}/sbin
- usrbindir =    ${prefix}/usr/bin
- usrsbindir =   ${prefix}/usr/sbin
--libudevdir =   ${prefix}/lib/udev
-+libudevdir =   ${prefix}/lib64/udev
- mandir =       ${prefix}/usr/share/man
- configdir =    ${etcdir}/udev/
- 
-diff -Naur udev-098.orig/extras/volume_id/lib/Makefile udev-098/extras/volume_id/lib/Makefile
---- udev-098.orig/extras/volume_id/lib/Makefile 2006-08-22 16:32:25.000000000 -0700
-+++ udev-098/extras/volume_id/lib/Makefile      2006-09-05 11:09:29.008720559 -0700
+diff -Naur udev-096.orig/extras/usb_id/Makefile udev-096/extras/usb_id/Makefile
+--- udev-096.orig/extras/usb_id/Makefile        2006-07-09 12:48:19.000000000 -0700
++++ udev-096/extras/usb_id/Makefile     2006-09-16 14:40:50.000000000 -0700
+@@ -16,7 +16,7 @@
+ sbindir =      ${prefix}/sbin
+ usrbindir =    ${prefix}/usr/bin
+ usrsbindir =   ${prefix}/usr/sbin
+-libudevdir =   ${prefix}/lib/udev
++libudevdir =   ${prefix}/lib64/udev
+ mandir =       ${prefix}/usr/share/man
+ configdir =    ${etcdir}/udev/
+ 
+diff -Naur udev-096.orig/extras/volume_id/lib/Makefile udev-096/extras/volume_id/lib/Makefile
+--- udev-096.orig/extras/volume_id/lib/Makefile 2006-07-09 12:48:19.000000000 -0700
++++ udev-096/extras/volume_id/lib/Makefile      2006-09-16 14:40:50.000000000 -0700
 @@ -5,8 +5,8 @@
  # Released under the GNU General Public License, version 2.
@@ -163 +150 @@
  INSTALL = /usr/bin/install -c
  INSTALL_DATA  = ${INSTALL} -m 644
-diff -Naur udev-098.orig/udev_rules_parse.c udev-098/udev_rules_parse.c
---- udev-098.orig/udev_rules_parse.c    2006-08-22 16:32:25.000000000 -0700
-+++ udev-098/udev_rules_parse.c 2006-09-05 11:12:24.532142387 -0700
-@@ -432,9 +432,9 @@
+diff -Naur udev-096.orig/extras/volume_id/Makefile udev-096/extras/volume_id/Makefile
+--- udev-096.orig/extras/volume_id/Makefile     2006-07-09 12:48:19.000000000 -0700
++++ udev-096/extras/volume_id/Makefile  2006-09-16 14:40:50.000000000 -0700
+@@ -14,7 +14,7 @@
+ sbindir =      ${prefix}/sbin
+ usrbindir =    ${prefix}/usr/bin
+ usrsbindir =   ${prefix}/usr/sbin
+-libudevdir =   ${prefix}/lib/udev
++libudevdir =   ${prefix}/lib64/udev
+ mandir =       ${prefix}/usr/share/man
+ configdir =    ${etcdir}/udev/
+ 
+diff -Naur udev-096.orig/Makefile udev-096/Makefile
+--- udev-096.orig/Makefile      2006-07-09 12:48:19.000000000 -0700
++++ udev-096/Makefile   2006-09-16 14:40:50.000000000 -0700
+@@ -98,7 +98,7 @@
+ sbindir =      ${prefix}/sbin
+ usrbindir =    ${prefix}/usr/bin
+ usrsbindir =   ${prefix}/usr/sbin
+-libudevdir =   ${prefix}/lib/udev
++libudevdir =   ${prefix}/lib64/udev
+ mandir =       ${prefix}/usr/share/man
+ configdir =    ${etcdir}/udev
+ udevdir =      /dev
+diff -Naur udev-096.orig/udev_rules_parse.c udev-096/udev_rules_parse.c
+--- udev-096.orig/udev_rules_parse.c    2006-07-09 12:48:19.000000000 -0700
++++ udev-096/udev_rules_parse.c 2006-09-16 14:40:50.000000000 -0700
+@@ -396,9 +396,9 @@
                                 if (pos)
                                         pos[0] = '\0';
@@ -178 +189 @@
                                         pos = strchr(file, ' ');
                                         if (pos)
-diff -Naur udev-098.orig/udev_utils_run.c udev-098/udev_utils_run.c
---- udev-098.orig/udev_utils_run.c      2006-08-22 16:32:25.000000000 -0700
-+++ udev-098/udev_utils_run.c   2006-09-05 11:09:32.512629158 -0700
+diff -Naur udev-096.orig/udev_utils_run.c udev-096/udev_utils_run.c
+--- udev-096.orig/udev_utils_run.c      2006-07-09 12:48:19.000000000 -0700
++++ udev-096/udev_utils_run.c   2006-09-16 14:40:50.000000000 -0700
 @@ -124,9 +124,9 @@
                 }