Changeset fab693d for patches

Timestamp:

Sep 3, 2007, 1:11:35 AM (17 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:

c13bac4

Parents:

8731fd5

Message:

Updated to udev 115.

File:

• patches/udev-115-lib64-1.patch (moved) (moved from patches/udev-105-lib64-1.patch ) (7 diffs)

patches/udev-115-lib64-1.patch

@@ -1 +1 @@
 Submitted By: Jim Gifford <jim@linuxfromscratch.org>
-Date: 2006-09-16
+Date: 2007-09-01
 Upstream Status: Unknown
 Origin: Jim Gifford
 Description: Change /lib/udev to /lib64/udev
 
-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
+diff -Naur udev-115.orig/extras/ata_id/Makefile udev-115/extras/ata_id/Makefile
+--- udev-115.orig/extras/ata_id/Makefile        2007-08-23 16:29:54.000000000 -0700
++++ udev-115/extras/ata_id/Makefile     2007-09-01 23:15:07.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-115.orig/extras/cdrom_id/Makefile udev-115/extras/cdrom_id/Makefile
+--- udev-115.orig/extras/cdrom_id/Makefile      2007-08-23 16:29:54.000000000 -0700
++++ udev-115/extras/cdrom_id/Makefile   2007-09-01 23:15:07.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-115.orig/extras/collect/Makefile udev-115/extras/collect/Makefile
+--- udev-115.orig/extras/collect/Makefile       2007-08-23 16:29:54.000000000 -0700
++++ udev-115/extras/collect/Makefile    2007-09-01 23:21:10.000000000 -0700
+@@ -11,7 +11,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-115.orig/extras/edd_id/Makefile udev-115/extras/edd_id/Makefile
+--- udev-115.orig/extras/edd_id/Makefile        2007-08-23 16:29:54.000000000 -0700
++++ udev-115/extras/edd_id/Makefile     2007-09-01 23:15:07.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-115.orig/extras/firmware/firmware.sh udev-115/extras/firmware/firmware.sh
+--- udev-115.orig/extras/firmware/firmware.sh   2007-08-23 16:29:54.000000000 -0700
++++ udev-115/extras/firmware/firmware.sh        2007-09-01 23:23:42.000000000 -0700
 @@ -1,6 +1,6 @@
  #!/bin/sh -e
@@ -64 +64 @@
  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
- 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/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
- 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/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
- 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/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
+diff -Naur udev-115.orig/extras/firmware/Makefile udev-115/extras/firmware/Makefile
+--- udev-115.orig/extras/firmware/Makefile      2007-08-23 16:29:54.000000000 -0700
++++ udev-115/extras/firmware/Makefile   2007-09-01 23:15:07.000000000 -0700
+@@ -13,7 +13,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-115.orig/extras/floppy/Makefile udev-115/extras/floppy/Makefile
+--- udev-115.orig/extras/floppy/Makefile        2007-08-23 16:29:54.000000000 -0700
++++ udev-115/extras/floppy/Makefile     2007-09-01 23:15:07.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-115.orig/extras/path_id/Makefile udev-115/extras/path_id/Makefile
+--- udev-115.orig/extras/path_id/Makefile       2007-08-23 16:29:54.000000000 -0700
++++ udev-115/extras/path_id/Makefile    2007-09-01 23:15:07.000000000 -0700
+@@ -13,7 +13,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-115.orig/extras/rule_generator/Makefile udev-115/extras/rule_generator/Makefile
+--- udev-115.orig/extras/rule_generator/Makefile        2007-08-23 16:29:54.000000000 -0700
++++ udev-115/extras/rule_generator/Makefile     2007-09-01 23:15:07.000000000 -0700
+@@ -13,7 +13,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-115.orig/extras/rule_generator/write_cd_rules udev-115/extras/rule_generator/write_cd_rules
+--- udev-115.orig/extras/rule_generator/write_cd_rules  2007-08-23 16:29:54.000000000 -0700
++++ udev-115/extras/rule_generator/write_cd_rules       2007-09-01 23:15:07.000000000 -0700
+@@ -13,7 +13,7 @@
+ 
+ RULES_FILE="/etc/udev/rules.d/70-persistent-cd.rules"
+ 
+-. /lib/udev/rule_generator.functions
++. /lib64/udev/rule_generator.functions
+ 
+ find_next_available() {
+        raw_find_next_available "$(find_all_rules 'SYMLINK+=' "$1")"
+diff -Naur udev-115.orig/extras/rule_generator/write_net_rules udev-115/extras/rule_generator/write_net_rules
+--- udev-115.orig/extras/rule_generator/write_net_rules 2007-08-23 16:29:54.000000000 -0700
++++ udev-115/extras/rule_generator/write_net_rules      2007-09-01 23:15:07.000000000 -0700
+@@ -18,7 +18,7 @@
+ 
+ RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules'
+ 
+-. /lib/udev/rule_generator.functions
++. /lib64/udev/rule_generator.functions
+ 
+ interface_name_taken() {
+        local value="$(find_all_rules 'NAME=' $INTERFACE)"
+diff -Naur udev-115.orig/extras/scsi_id/Makefile udev-115/extras/scsi_id/Makefile
+--- udev-115.orig/extras/scsi_id/Makefile       2007-08-23 16:29:54.000000000 -0700
++++ udev-115/extras/scsi_id/Makefile    2007-09-01 23:15:07.000000000 -0700
 @@ -19,7 +19,7 @@
  sbindir =      ${prefix}/sbin
@@ -124 +148 @@
  configdir =    ${etcdir}/udev/
  
-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
+diff -Naur udev-115.orig/extras/usb_id/Makefile udev-115/extras/usb_id/Makefile
+--- udev-115.orig/extras/usb_id/Makefile        2007-08-23 16:29:54.000000000 -0700
++++ udev-115/extras/usb_id/Makefile     2007-09-01 23:15:07.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-115.orig/extras/volume_id/lib/Makefile udev-115/extras/volume_id/lib/Makefile
+--- udev-115.orig/extras/volume_id/lib/Makefile 2007-08-23 16:29:54.000000000 -0700
++++ udev-115/extras/volume_id/lib/Makefile      2007-09-01 23:15:07.000000000 -0700
 @@ -5,8 +5,8 @@
  # Released under the GNU General Public License, version 2.
@@ -148 +172 @@
 +usrlibdir =    ${prefix}/usr/lib64
  
- INSTALL = /usr/bin/install -c
+ INSTALL = install -c
  INSTALL_DATA  = ${INSTALL} -m 644
-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
+diff -Naur udev-115.orig/extras/volume_id/Makefile udev-115/extras/volume_id/Makefile
+--- udev-115.orig/extras/volume_id/Makefile     2007-08-23 16:29:54.000000000 -0700
++++ udev-115/extras/volume_id/Makefile  2007-09-01 23:15:07.000000000 -0700
 @@ -14,7 +14,7 @@
  sbindir =      ${prefix}/sbin
@@ -162 +186 @@
  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 @@
+diff -Naur udev-115.orig/Makefile udev-115/Makefile
+--- udev-115.orig/Makefile      2007-08-23 16:29:54.000000000 -0700
++++ udev-115/Makefile   2007-09-01 23:15:07.000000000 -0700
+@@ -94,7 +94,7 @@
  sbindir =      ${prefix}/sbin
  usrbindir =    ${prefix}/usr/bin
@@ -174 +198 @@
  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 @@
+diff -Naur udev-115.orig/udev_rules.c udev-115/udev_rules.c
+--- udev-115.orig/udev_rules.c  2007-08-23 16:29:54.000000000 -0700
++++ udev-115/udev_rules.c       2007-09-01 23:19:11.000000000 -0700
+@@ -170,9 +170,9 @@
+                }
+        }
+ 
+-       /* allow programs in /lib/udev called without the path */
++       /* allow programs in /lib64/udev called without the path */
+        if (strchr(argv[0], '/') == NULL) {
+-               strlcpy(program, "/lib/udev/", sizeof(program));
++               strlcpy(program, "/lib64/udev/", sizeof(program));
+                strlcat(program, argv[0], sizeof(program));
+                argv[0] = program;
+        }
+diff -Naur udev-115.orig/udev_rules_parse.c udev-115/udev_rules_parse.c
+--- udev-115.orig/udev_rules_parse.c    2007-08-23 16:29:54.000000000 -0700
++++ udev-115/udev_rules_parse.c 2007-09-01 23:15:07.000000000 -0700
+@@ -445,9 +445,9 @@
                                 if (pos)
                                         pos[0] = '\0';
@@ -189 +228 @@
                                         pos = strchr(file, ' ');
                                         if (pos)
-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 @@
-                }
-        }
- 
--       /* allow programs in /lib/udev called without the path */
-+       /* allow programs in /lib64/udev called without the path */
-        if (strchr(argv[0], '/') == NULL) {
--               strlcpy(program, "/lib/udev/", sizeof(program));
-+               strlcpy(program, "/lib64/udev/", sizeof(program));
-                strlcat(program, argv[0], sizeof(program));
-                argv[0] = program;
-        }