Changeset 3f79d3c for patches


Ignore:
Timestamp:
Jul 7, 2008, 5:43:01 PM (16 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
ca9712f
Parents:
cade792
Message:

Fix a omission in the Udev lib64 patch. Thanks to AcidPoison for catching this and reporting it in Trac.

File:
1 moved

Legend:

Unmodified
Added
Removed

  • patches/udev-124-lib64-2.patch

    rcade792 r3f79d3c  
     1Submitted By: Jim Gifford <jim@linuxfromscratch.org>
     2Date: 2008-07-07
     3Upstream Status: CLFS Specific
     4Origin: Jim Gifford
     5Description: Change /lib/udev to /lib64/udev
     6
    17diff -Naur udev-124.orig/etc/udev/rules.d/50-udev-default.rules udev-124/etc/udev/rules.d/50-udev-default.rules
    28--- udev-124.orig/etc/udev/rules.d/50-udev-default.rules        2008-06-12 01:24:30.000000000 -0400
    3 +++ udev-124/etc/udev/rules.d/50-udev-default.rules     2008-06-28 15:08:19.383343687 -0400
     9+++ udev-124/etc/udev/rules.d/50-udev-default.rules     2008-07-07 20:29:35.000000000 -0400
    410@@ -103,5 +103,5 @@
    511 KERNEL=="iowarrior[0-9]*",     NAME="usb/%k"
    … …  
    1117diff -Naur udev-124.orig/extras/ata_id/Makefile udev-124/extras/ata_id/Makefile
    1218--- udev-124.orig/extras/ata_id/Makefile        2008-06-12 01:24:30.000000000 -0400
    13 +++ udev-124/extras/ata_id/Makefile     2008-06-28 15:05:05.667519435 -0400
     19+++ udev-124/extras/ata_id/Makefile     2008-07-07 20:29:35.000000000 -0400
    1420@@ -16,7 +16,7 @@
    1521 sbindir =      ${prefix}/sbin
    … …  
    2329diff -Naur udev-124.orig/extras/cdrom_id/Makefile udev-124/extras/cdrom_id/Makefile
    2430--- udev-124.orig/extras/cdrom_id/Makefile      2008-06-12 01:24:30.000000000 -0400
    25 +++ udev-124/extras/cdrom_id/Makefile   2008-06-28 15:04:54.009080964 -0400
     31+++ udev-124/extras/cdrom_id/Makefile   2008-07-07 20:29:35.000000000 -0400
    2632@@ -16,7 +16,7 @@
    2733 sbindir =      ${prefix}/sbin
    … …  
    3541diff -Naur udev-124.orig/extras/collect/Makefile udev-124/extras/collect/Makefile
    3642--- udev-124.orig/extras/collect/Makefile       2008-06-12 01:24:30.000000000 -0400
    37 +++ udev-124/extras/collect/Makefile    2008-06-28 15:04:44.156091083 -0400
     43+++ udev-124/extras/collect/Makefile    2008-07-07 20:29:35.000000000 -0400
    3844@@ -11,7 +11,7 @@
    3945 sbindir =      ${prefix}/sbin
    … …  
    4753diff -Naur udev-124.orig/extras/edd_id/Makefile udev-124/extras/edd_id/Makefile
    4854--- udev-124.orig/extras/edd_id/Makefile        2008-06-12 01:24:30.000000000 -0400
    49 +++ udev-124/extras/edd_id/Makefile     2008-06-28 15:04:34.455054556 -0400
     55+++ udev-124/extras/edd_id/Makefile     2008-07-07 20:29:35.000000000 -0400
    5056@@ -16,7 +16,7 @@
    5157 sbindir =      ${prefix}/sbin
    … …  
    5965diff -Naur udev-124.orig/extras/firmware/firmware.sh udev-124/extras/firmware/firmware.sh
    6066--- udev-124.orig/extras/firmware/firmware.sh   2008-06-12 01:24:30.000000000 -0400
    61 +++ udev-124/extras/firmware/firmware.sh        2008-06-28 15:04:12.355805544 -0400
     67+++ udev-124/extras/firmware/firmware.sh        2008-07-07 20:29:35.000000000 -0400
    6268@@ -1,6 +1,6 @@
    6369 #!/bin/sh -e
    … …  
    7076diff -Naur udev-124.orig/extras/firmware/Makefile udev-124/extras/firmware/Makefile
    7177--- udev-124.orig/extras/firmware/Makefile      2008-06-12 01:24:30.000000000 -0400
    72 +++ udev-124/extras/firmware/Makefile   2008-06-28 15:04:22.552690448 -0400
     78+++ udev-124/extras/firmware/Makefile   2008-07-07 20:29:35.000000000 -0400
    7379@@ -13,7 +13,7 @@
    7480 sbindir =      ${prefix}/sbin
    … …  
    8288diff -Naur udev-124.orig/extras/floppy/Makefile udev-124/extras/floppy/Makefile
    8389--- udev-124.orig/extras/floppy/Makefile        2008-06-12 01:24:30.000000000 -0400
    84 +++ udev-124/extras/floppy/Makefile     2008-06-28 15:03:45.907884474 -0400
     90+++ udev-124/extras/floppy/Makefile     2008-07-07 20:29:35.000000000 -0400
    8591@@ -16,7 +16,7 @@
    8692 sbindir =      ${prefix}/sbin
    … …  
    94100diff -Naur udev-124.orig/extras/fstab_import/Makefile udev-124/extras/fstab_import/Makefile
    95101--- udev-124.orig/extras/fstab_import/Makefile  2008-06-12 01:24:30.000000000 -0400
    96 +++ udev-124/extras/fstab_import/Makefile       2008-06-28 15:03:36.456771831 -0400
     102+++ udev-124/extras/fstab_import/Makefile       2008-07-07 20:29:35.000000000 -0400
    97103@@ -16,7 +16,7 @@
    98104 sbindir =      ${prefix}/sbin
    … …  
    106112diff -Naur udev-124.orig/extras/path_id/Makefile udev-124/extras/path_id/Makefile
    107113--- udev-124.orig/extras/path_id/Makefile       2008-06-12 01:24:30.000000000 -0400
    108 +++ udev-124/extras/path_id/Makefile    2008-06-28 15:03:26.182910124 -0400
     114+++ udev-124/extras/path_id/Makefile    2008-07-07 20:29:35.000000000 -0400
    109115@@ -13,7 +13,7 @@
    110116 sbindir =      ${prefix}/sbin
    … …  
    118124diff -Naur udev-124.orig/extras/rule_generator/Makefile udev-124/extras/rule_generator/Makefile
    119125--- udev-124.orig/extras/rule_generator/Makefile        2008-06-12 01:24:30.000000000 -0400
    120 +++ udev-124/extras/rule_generator/Makefile     2008-06-28 15:02:01.446795250 -0400
     126+++ udev-124/extras/rule_generator/Makefile     2008-07-07 20:29:35.000000000 -0400
    121127@@ -13,7 +13,7 @@
    122128 sbindir =      ${prefix}/sbin
    … …  
    130136diff -Naur udev-124.orig/extras/rule_generator/write_cd_rules udev-124/extras/rule_generator/write_cd_rules
    131137--- udev-124.orig/extras/rule_generator/write_cd_rules  2008-06-12 01:24:30.000000000 -0400
    132 +++ udev-124/extras/rule_generator/write_cd_rules       2008-06-28 15:01:37.457123739 -0400
     138+++ udev-124/extras/rule_generator/write_cd_rules       2008-07-07 20:29:35.000000000 -0400
    133139@@ -13,7 +13,7 @@
    134140 
    … …  
    142148diff -Naur udev-124.orig/extras/rule_generator/write_net_rules udev-124/extras/rule_generator/write_net_rules
    143149--- udev-124.orig/extras/rule_generator/write_net_rules 2008-06-12 01:24:30.000000000 -0400
    144 +++ udev-124/extras/rule_generator/write_net_rules      2008-06-28 15:01:22.066824977 -0400
     150+++ udev-124/extras/rule_generator/write_net_rules      2008-07-07 20:29:35.000000000 -0400
    145151@@ -24,7 +24,7 @@
    146152 
    … …  
    154160diff -Naur udev-124.orig/extras/scsi_id/Makefile udev-124/extras/scsi_id/Makefile
    155161--- udev-124.orig/extras/scsi_id/Makefile       2008-06-12 01:24:30.000000000 -0400
    156 +++ udev-124/extras/scsi_id/Makefile    2008-06-28 15:00:48.630039098 -0400
     162+++ udev-124/extras/scsi_id/Makefile    2008-07-07 20:29:35.000000000 -0400
    157163@@ -19,7 +19,7 @@
    158164 sbindir =      ${prefix}/sbin
    … …  
    166172diff -Naur udev-124.orig/extras/usb_id/Makefile udev-124/extras/usb_id/Makefile
    167173--- udev-124.orig/extras/usb_id/Makefile        2008-06-12 01:24:30.000000000 -0400
    168 +++ udev-124/extras/usb_id/Makefile     2008-06-28 15:00:33.581636223 -0400
    169 @@ -16,7 +16,7 @@
    170  sbindir =      ${prefix}/sbin
    171  usrbindir =    ${prefix}/usr/bin
    172  usrsbindir =   ${prefix}/usr/sbin
    173 -libudevdir =   ${prefix}/lib/udev
    174 +libudevdir =   ${prefix}/lib64/udev
    175  mandir =       ${prefix}/usr/share/man
    176  configdir =    ${etcdir}/udev/
    177  
     174+++ udev-124/extras/usb_id/Makefile     2008-07-07 20:29:35.000000000 -0400
     175@@ -16,7 +16,7 @@
     176 sbindir =      ${prefix}/sbin
     177 usrbindir =    ${prefix}/usr/bin
     178 usrsbindir =   ${prefix}/usr/sbin
     179-libudevdir =   ${prefix}/lib/udev
     180+libudevdir =   ${prefix}/lib64/udev
     181 mandir =       ${prefix}/usr/share/man
     182 configdir =    ${etcdir}/udev/
     183 
     184diff -Naur udev-124.orig/extras/volume_id/lib/Makefile udev-124/extras/volume_id/lib/Makefile
     185--- udev-124.orig/extras/volume_id/lib/Makefile 2008-06-12 01:24:30.000000000 -0400
     186+++ udev-124/extras/volume_id/lib/Makefile      2008-07-07 20:31:21.000000000 -0400
     187@@ -5,8 +5,8 @@
     188 # Released under the GNU General Public License, version 2.
     189 #
     190 includedir =   ${prefix}/usr/include
     191-libdir =       ${prefix}/lib
     192-usrlibdir =    ${prefix}/usr/lib
     193+libdir =       ${prefix}/lib64
     194+usrlibdir =    ${prefix}/usr/lib64
     195 
     196 INSTALL = install -c
     197 INSTALL_DATA  = ${INSTALL} -m 644
    178198diff -Naur udev-124.orig/extras/volume_id/Makefile udev-124/extras/volume_id/Makefile
    179199--- udev-124.orig/extras/volume_id/Makefile     2008-06-12 01:24:30.000000000 -0400
    180 +++ udev-124/extras/volume_id/Makefile  2008-06-28 15:00:19.792848447 -0400
     200+++ udev-124/extras/volume_id/Makefile  2008-07-07 20:29:35.000000000 -0400
    181201@@ -14,7 +14,7 @@
    182202 sbindir =      ${prefix}/sbin
    … …  
    190210diff -Naur udev-124.orig/Makefile udev-124/Makefile
    191211--- udev-124.orig/Makefile      2008-06-12 01:24:30.000000000 -0400
    192 +++ udev-124/Makefile   2008-06-28 14:58:52.953375683 -0400
     212+++ udev-124/Makefile   2008-07-07 20:29:35.000000000 -0400
    193213@@ -88,7 +88,7 @@
    194214 etcdir =       ${prefix}/etc
    … …  
    202222diff -Naur udev-124.orig/udev_rules.c udev-124/udev_rules.c
    203223--- udev-124.orig/udev_rules.c  2008-06-12 01:24:30.000000000 -0400
    204 +++ udev-124/udev_rules.c       2008-06-28 14:58:22.839575040 -0400
     224+++ udev-124/udev_rules.c       2008-07-07 20:29:35.000000000 -0400
    205225@@ -172,9 +172,9 @@
    206226                }
    … …  
    217237diff -Naur udev-124.orig/udev_rules_parse.c udev-124/udev_rules_parse.c
    218238--- udev-124.orig/udev_rules_parse.c    2008-06-12 01:24:30.000000000 -0400
    219 +++ udev-124/udev_rules_parse.c 2008-06-28 14:56:57.988495302 -0400
     239+++ udev-124/udev_rules_parse.c 2008-07-07 20:29:35.000000000 -0400
    220240@@ -447,9 +447,9 @@
    221241                                if (pos)
Note: See TracChangeset for help on using the changeset viewer.