diff --git a/pkgs/os-specific/linux/hotplug/builder.sh b/pkgs/os-specific/linux/hotplug/builder.sh index ad924089c19..06a6afaa693 100644 --- a/pkgs/os-specific/linux/hotplug/builder.sh +++ b/pkgs/os-specific/linux/hotplug/builder.sh @@ -23,6 +23,10 @@ preBuild() { < etc/hotplug/pci.rc > etc/hotplug/pci.rc.tmp mv etc/hotplug/pci.rc.tmp etc/hotplug/pci.rc + sed -e "s^@gnused\@^$gnused^g" \ + < etc/hotplug/usb.agent > etc/hotplug/usb.agent.tmp + mv etc/hotplug/usb.agent.tmp etc/hotplug/usb.agent + sed -e "s^@coreutils\@^$coreutils^g" \ -e "s^@gnugrep\@^$gnugrep^g" \ -e "s^@utillinux\@^$utillinux^g" \ diff --git a/pkgs/os-specific/linux/hotplug/hotplug-2004_03_29-bash.patch b/pkgs/os-specific/linux/hotplug/hotplug-2004_03_29-bash.patch index 917daa90ac0..8d072d702c4 100644 --- a/pkgs/os-specific/linux/hotplug/hotplug-2004_03_29-bash.patch +++ b/pkgs/os-specific/linux/hotplug/hotplug-2004_03_29-bash.patch @@ -25,7 +25,7 @@ diff -ruN hotplug-2004_03_29/etc/hotplug/dasd.permissions hotplug-2004_03_29.new +} diff -ruN hotplug-2004_03_29/etc/hotplug/hotplug.functions hotplug-2004_03_29.new/etc/hotplug/hotplug.functions --- hotplug-2004_03_29/etc/hotplug/hotplug.functions 2004-03-29 21:25:59.000000000 +0200 -+++ hotplug-2004_03_29.new/etc/hotplug/hotplug.functions 2006-01-05 18:48:13.000000000 +0100 ++++ hotplug-2004_03_29.new/etc/hotplug/hotplug.functions 2006-01-05 20:29:47.000000000 +0100 @@ -13,7 +13,7 @@ # DEBUG=yes; export DEBUG PATH=/bin:/sbin:/usr/sbin:/usr/bin @@ -77,6 +77,34 @@ diff -ruN hotplug-2004_03_29/etc/hotplug/tape.permissions hotplug-2004_03_29.new # # Copyright (c) 2002 IBM Development Germany, Boeblingen # +diff -ruN hotplug-2004_03_29/etc/hotplug/usb.agent hotplug-2004_03_29.new/etc/hotplug/usb.agent +--- hotplug-2004_03_29/etc/hotplug/usb.agent 2004-03-26 23:36:38.000000000 +0100 ++++ hotplug-2004_03_29.new/etc/hotplug/usb.agent 2006-01-05 20:38:35.000000000 +0100 +@@ -174,10 +174,10 @@ + # work around 2.2.early brokenness + # munges the usb_bcdDevice such that it is a integer rather + # than a float: e.g. 1.0 become 0100 +- PRODUCT=`echo $PRODUCT | sed -e "s+\.\([0-9]\)$+.\10+" -e "s/\.$/00/" \ ++ PRODUCT=`echo $PRODUCT | @gnused@/bin/sed -e "s+\.\([0-9]\)$+.\10+" -e "s/\.$/00/" \ + -e "s+/\([0-9]\)\.\([0-9][0-9]\)+/0\1\2+" \ + -e "s+/\([0-9][0-9]\)\.\([0-9][0-9]\)+/\1\2+"` +- set $(echo $PRODUCT | sed -e 's+\([^/]*\)/\([^/]*\)/\(.*\)+\1 \2 \3+') ++ set $(echo $PRODUCT | @gnused@/bin/sed -e 's+\([^/]*\)/\([^/]*\)/\(.*\)+\1 \2 \3+') + usb_idVendor=$((0x$1)) + usb_idProduct=$((0x$2)) + usb_bcdDevice=$((0x$3)) +@@ -340,9 +340,9 @@ + # remover, or that the remove action can use to execute a remover. + # + if [ "$DEVICE" = "" ]; then +- REMOVER=/var/run/usb/`echo "$INTERFACE/$PRODUCT/$TYPE" | sed -e 's;/;%;g'` ++ REMOVER=/var/run/usb/`echo "$INTERFACE/$PRODUCT/$TYPE" | @gnused@/bin/sed -e 's;/;%;g'` + else +- REMOVER=/var/run/usb/`echo $DEVICE | sed -e 's;/;%;g'` ++ REMOVER=/var/run/usb/`echo $DEVICE | @gnused@/bin/sed -e 's;/;%;g'` + fi + export REMOVER + diff -ruN hotplug-2004_03_29/etc/hotplug/usb.rc hotplug-2004_03_29.new/etc/hotplug/usb.rc --- hotplug-2004_03_29/etc/hotplug/usb.rc 2004-03-29 21:34:30.000000000 +0200 +++ hotplug-2004_03_29.new/etc/hotplug/usb.rc 2006-01-05 20:26:21.000000000 +0100