source: patches/udev-118-lib64-1.patch@ 96cbcec

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 96cbcec was a60e4c5, checked in by Joe Ciccone <jciccone@…>, 17 years ago

Updated Various branch update patches.
  • Property mode set to 100644
File size: 8.8 KB

  • extras/ata_id/Makefile 

    Submitted By: Jim Gifford <jim@linuxfromscratch.org>
Date: 2007-09-01
Upstream Status: Unknown
Origin: Jim Gifford
Description: Change /lib/udev to /lib64/udev

diff -Naur udev-115.orig/extras/ata_id/Makefile udev-115/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-115.orig/extras/cdrom_id/Makefile udev-115/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-115.orig/extras/collect/Makefile udev-115/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-115.orig/extras/edd_id/Makefile udev-115/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-115.orig/extras/firmware/firmware.sh udev-115/extras/firmware/firmware.sh
    old new  
    11#!/bin/sh -e
    22
    3 FIRMWARE_DIRS="/lib/firmware /usr/local/lib/firmware"
     3FIRMWARE_DIRS="/lib64/firmware /usr/local/lib64/firmware"
    44
    55err() {
    66    echo "$@" >&2

  • extras/firmware/Makefile 

    diff -Naur udev-115.orig/extras/firmware/Makefile udev-115/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-115.orig/extras/floppy/Makefile udev-115/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/path_id/Makefile 

    diff -Naur udev-115.orig/extras/path_id/Makefile udev-115/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-115.orig/extras/rule_generator/Makefile udev-115/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-115.orig/extras/rule_generator/write_cd_rules udev-115/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-115.orig/extras/rule_generator/write_net_rules udev-115/extras/rule_generator/write_net_rules
    old new  
    1818
    1919RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules'
    2020
    21 . /lib/udev/rule_generator.functions
     21. /lib64/udev/rule_generator.functions
    2222
    2323interface_name_taken() {
    2424        local value="$(find_all_rules 'NAME=' $INTERFACE)"

  • extras/scsi_id/Makefile 

    diff -Naur udev-115.orig/extras/scsi_id/Makefile udev-115/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-115.orig/extras/usb_id/Makefile udev-115/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-115.orig/extras/volume_id/lib/Makefile udev-115/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-115.orig/extras/volume_id/Makefile udev-115/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-115.orig/Makefile udev-115/Makefile
    old new  
    9494sbindir =       ${prefix}/sbin
    9595usrbindir =     ${prefix}/usr/bin
    9696usrsbindir =    ${prefix}/usr/sbin
    97 libudevdir =    ${prefix}/lib/udev
     97libudevdir =    ${prefix}/lib64/udev
    9898mandir =        ${prefix}/usr/share/man
    9999configdir =     ${etcdir}/udev
    100100udevdir =       /dev

  • udev_rules.c 

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

  • udev_rules_parse.c 

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