source: patches/udev-124-lib64-2.patch@ dc4f9f2

clfs-1.1.0
Last change on this file since dc4f9f2 was 67300de, checked in by Joe Ciccone <jciccone@…>, 16 years ago

Create a clfs-1.1 branch in preperation for a RC.
  • Property mode set to 100644
File size: 9.9 KB

  • etc/udev/rules.d/50-udev-default.rules 

    Submitted By: Jim Gifford <jim@linuxfromscratch.org>
Date: 2008-07-07
Upstream Status: CLFS Specific
Origin: Jim Gifford
Description: Change /lib/udev to /lib64/udev

diff -Naur udev-124.orig/etc/udev/rules.d/50-udev-default.rules udev-124/etc/udev/rules.d/50-udev-default.rules
    old new  
    103103KERNEL=="iowarrior[0-9]*",      NAME="usb/%k"
    104104
    105105# do not delete static device nodes
    106 ACTION=="remove", NAME=="?*", TEST=="/lib/udev/devices/$name", OPTIONS+="ignore_remove"
     106ACTION=="remove", NAME=="?*", TEST=="/lib64/udev/devices/$name", OPTIONS+="ignore_remove"
    107107

  • extras/ata_id/Makefile 

    diff -Naur udev-124.orig/extras/ata_id/Makefile udev-124/extras/ata_id/Makefile
    old new  
    1616sbindir =       ${prefix}/sbin
    1717usrbindir =     ${prefix}/usr/bin
    1818usrsbindir =    ${prefix}/usr/sbin
    19 libudevdir =    ${prefix}/lib/udev
     19libudevdir =    ${prefix}/lib64/udev
    2020mandir =        ${prefix}/usr/share/man
    2121configdir =     ${etcdir}/udev/
    2222

  • extras/cdrom_id/Makefile 

    diff -Naur udev-124.orig/extras/cdrom_id/Makefile udev-124/extras/cdrom_id/Makefile
    old new  
    1616sbindir =       ${prefix}/sbin
    1717usrbindir =     ${prefix}/usr/bin
    1818usrsbindir =    ${prefix}/usr/sbin
    19 libudevdir =    ${prefix}/lib/udev
     19libudevdir =    ${prefix}/lib64/udev
    2020mandir =        ${prefix}/usr/share/man
    2121configdir =     ${etcdir}/udev
    2222

  • extras/collect/Makefile 

    diff -Naur udev-124.orig/extras/collect/Makefile udev-124/extras/collect/Makefile
    old new  
    1111sbindir =       ${prefix}/sbin
    1212usrbindir =     ${prefix}/usr/bin
    1313usrsbindir =    ${prefix}/usr/sbin
    14 libudevdir =    ${prefix}/lib/udev
     14libudevdir =    ${prefix}/lib64/udev
    1515mandir =        ${prefix}/usr/share/man
    1616configdir =     ${etcdir}/udev/
    1717

  • extras/edd_id/Makefile 

    diff -Naur udev-124.orig/extras/edd_id/Makefile udev-124/extras/edd_id/Makefile
    old new  
    1616sbindir =       ${prefix}/sbin
    1717usrbindir =     ${prefix}/usr/bin
    1818usrsbindir =    ${prefix}/usr/sbin
    19 libudevdir =    ${prefix}/lib/udev
     19libudevdir =    ${prefix}/lib64/udev
    2020mandir =        ${prefix}/usr/share/man
    2121configdir =     ${etcdir}/udev/
    2222

  • extras/firmware/firmware.sh 

    diff -Naur udev-124.orig/extras/firmware/firmware.sh udev-124/extras/firmware/firmware.sh
    old new  
    11#!/bin/sh -e
    22
    3 FIRMWARE_DIRS="/lib/firmware /usr/local/lib/firmware"
     3FIRMWARE_DIRS="/lib64/firmware /lib/firmware /usr/local/lib64/firmware /usr/local/lib/firmware"
    44
    55err() {
    66        echo "$@" >&2

  • extras/firmware/Makefile 

    diff -Naur udev-124.orig/extras/firmware/Makefile udev-124/extras/firmware/Makefile
    old new  
    1313sbindir =       ${prefix}/sbin
    1414usrbindir =     ${prefix}/usr/bin
    1515usrsbindir =    ${prefix}/usr/sbin
    16 libudevdir =    ${prefix}/lib/udev
     16libudevdir =    ${prefix}/lib64/udev
    1717mandir =        ${prefix}/usr/share/man
    1818configdir =     ${etcdir}/udev/
    1919

  • extras/floppy/Makefile 

    diff -Naur udev-124.orig/extras/floppy/Makefile udev-124/extras/floppy/Makefile
    old new  
    1616sbindir =       ${prefix}/sbin
    1717usrbindir =     ${prefix}/usr/bin
    1818usrsbindir =    ${prefix}/usr/sbin
    19 libudevdir =    ${prefix}/lib/udev
     19libudevdir =    ${prefix}/lib64/udev
    2020mandir =        ${prefix}/usr/share/man
    2121configdir =     ${etcdir}/udev/
    2222

  • extras/fstab_import/Makefile 

    diff -Naur udev-124.orig/extras/fstab_import/Makefile udev-124/extras/fstab_import/Makefile
    old new  
    1616sbindir =       ${prefix}/sbin
    1717usrbindir =     ${prefix}/usr/bin
    1818usrsbindir =    ${prefix}/usr/sbin
    19 libudevdir =    ${prefix}/lib/udev
     19libudevdir =    ${prefix}/lib64/udev
    2020mandir =        ${prefix}/usr/share/man
    2121configdir =     ${etcdir}/udev/
    2222

  • extras/path_id/Makefile 

    diff -Naur udev-124.orig/extras/path_id/Makefile udev-124/extras/path_id/Makefile
    old new  
    1313sbindir =       ${prefix}/sbin
    1414usrbindir =     ${prefix}/usr/bin
    1515usrsbindir =    ${prefix}/usr/sbin
    16 libudevdir =    ${prefix}/lib/udev
     16libudevdir =    ${prefix}/lib64/udev
    1717mandir =        ${prefix}/usr/share/man
    1818configdir =     ${etcdir}/udev/
    1919

  • extras/rule_generator/Makefile 

    diff -Naur udev-124.orig/extras/rule_generator/Makefile udev-124/extras/rule_generator/Makefile
    old new  
    1313sbindir =       ${prefix}/sbin
    1414usrbindir =     ${prefix}/usr/bin
    1515usrsbindir =    ${prefix}/usr/sbin
    16 libudevdir =    ${prefix}/lib/udev
     16libudevdir =    ${prefix}/lib64/udev
    1717mandir =        ${prefix}/usr/share/man
    1818configdir =     ${etcdir}/udev
    1919

  • extras/rule_generator/write_cd_rules 

    diff -Naur udev-124.orig/extras/rule_generator/write_cd_rules udev-124/extras/rule_generator/write_cd_rules
    old new  
    1313
    1414RULES_FILE="/etc/udev/rules.d/70-persistent-cd.rules"
    1515
    16 . /lib/udev/rule_generator.functions
     16. /lib64/udev/rule_generator.functions
    1717
    1818find_next_available() {
    1919        raw_find_next_available "$(find_all_rules 'SYMLINK+=' "$1")"

  • extras/rule_generator/write_net_rules 

    diff -Naur udev-124.orig/extras/rule_generator/write_net_rules udev-124/extras/rule_generator/write_net_rules
    old new  
    2424
    2525RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules'
    2626
    27 . /lib/udev/rule_generator.functions
     27. /lib64/udev/rule_generator.functions
    2828
    2929interface_name_taken() {
    3030        local value="$(find_all_rules 'NAME=' $INTERFACE)"

  • extras/scsi_id/Makefile 

    diff -Naur udev-124.orig/extras/scsi_id/Makefile udev-124/extras/scsi_id/Makefile
    old new  
    1919sbindir =       ${prefix}/sbin
    2020usrbindir =     ${prefix}/usr/bin
    2121usrsbindir =    ${prefix}/usr/sbin
    22 libudevdir =    ${prefix}/lib/udev
     22libudevdir =    ${prefix}/lib64/udev
    2323mandir =        ${prefix}/usr/share/man
    2424configdir =     ${etcdir}/udev/
    2525

  • extras/usb_id/Makefile 

    diff -Naur udev-124.orig/extras/usb_id/Makefile udev-124/extras/usb_id/Makefile
    old new  
    1616sbindir =       ${prefix}/sbin
    1717usrbindir =     ${prefix}/usr/bin
    1818usrsbindir =    ${prefix}/usr/sbin
    19 libudevdir =    ${prefix}/lib/udev
     19libudevdir =    ${prefix}/lib64/udev
    2020mandir =        ${prefix}/usr/share/man
    2121configdir =     ${etcdir}/udev/
    2222

  • extras/volume_id/lib/Makefile 

    diff -Naur udev-124.orig/extras/volume_id/lib/Makefile udev-124/extras/volume_id/lib/Makefile
    old new  
    55# Released under the GNU General Public License, version 2.
    66#
    77includedir =    ${prefix}/usr/include
    8 libdir =        ${prefix}/lib
    9 usrlibdir =     ${prefix}/usr/lib
     8libdir =        ${prefix}/lib64
     9usrlibdir =     ${prefix}/usr/lib64
    1010
    1111INSTALL = install -c
    1212INSTALL_DATA  = ${INSTALL} -m 644

  • extras/volume_id/Makefile 

    diff -Naur udev-124.orig/extras/volume_id/Makefile udev-124/extras/volume_id/Makefile
    old new  
    1414sbindir =       ${prefix}/sbin
    1515usrbindir =     ${prefix}/usr/bin
    1616usrsbindir =    ${prefix}/usr/sbin
    17 libudevdir =    ${prefix}/lib/udev
     17libudevdir =    ${prefix}/lib64/udev
    1818mandir =        ${prefix}/usr/share/man
    1919configdir =     ${etcdir}/udev/
    2020

  • Makefile 

    diff -Naur udev-124.orig/Makefile udev-124/Makefile
    old new  
    8888etcdir =        ${prefix}/etc
    8989sbindir =       ${prefix}/sbin
    9090usrbindir =     ${prefix}/usr/bin
    91 libudevdir =    ${prefix}/lib/udev
     91libudevdir =    ${prefix}/lib64/udev
    9292mandir =        ${prefix}/usr/share/man
    9393configdir =     ${etcdir}/udev
    9494udevdir =       /dev

  • udev_rules.c 

    diff -Naur udev-124.orig/udev_rules.c udev-124/udev_rules.c
    old new  
    172172                }
    173173        }
    174174
    175         /* allow programs in /lib/udev called without the path */
     175        /* allow programs in /lib64/udev called without the path */
    176176        if (strchr(argv[0], '/') == NULL) {
    177                 strlcpy(program, "/lib/udev/", sizeof(program));
     177                strlcpy(program, "/lib64/udev/", sizeof(program));
    178178                strlcat(program, argv[0], sizeof(program));
    179179                argv[0] = program;
    180180        }

  • udev_rules_parse.c 

    diff -Naur udev-124.orig/udev_rules_parse.c udev-124/udev_rules_parse.c
    old new  
    447447                                if (pos)
    448448                                        pos[0] = '\0';
    449449
    450                                 /* allow programs in /lib/udev called without the path */
     450                                /* allow programs in /lib64/udev called without the path */
    451451                                if (strchr(file, '/') == NULL) {
    452                                         strlcpy(file, "/lib/udev/", sizeof(file));
     452                                        strlcpy(file, "/lib64/udev/", sizeof(file));
    453453                                        strlcat(file, value, sizeof(file));
    454454                                        pos = strchr(file, ' ');
    455455                                        if (pos)
Note: See TracBrowser for help on using the repository browser.