next attempt to fix hotplug for collie by installing /etc/default/usbd which was missing since the beginning of time :)

BKrev: 419615d3_ZlVkUOz090cNElRz1yn0w

13 files changed, 13 insertions, 606 deletions

diff --git a/hotplug/files/collie/usbd b/hotplug/files/collie/usbd
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/hotplug/files/collie/usbd
diff --git a/hotplug/files/usbd b/hotplug/files/usbd
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/hotplug/files/usbd
diff --git a/hotplug/hotplug-20030501/busybox.patch b/hotplug/hotplug-20030501/busybox.patch
deleted file mode 100644
index 65146afa80..0000000000
--- a/hotplug/hotplug-20030501/busybox.patch
+++ /dev/null
@@ -1,192 +0,0 @@
---- hotplug-2003_05_01/etc/hotplug/net.agent~busybox
-+++ hotplug-2003_05_01/etc/hotplug/net.agent
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # Network hotplug policy agent for Linux 2.4 kernels
- #
-@@ -17,7 +17,7 @@
- #
- 
- cd /etc/hotplug
--. hotplug.functions
-+. ./hotplug.functions
- # DEBUG=yes export DEBUG
- 
- if [ "$INTERFACE" = "" ]; then
-@@ -36,11 +36,6 @@
- 	    ;;
- 	# interfaces that are registered then brought up
- 	*)
--	    # NOTE:  network configuration relies on administered state,
--	    # we can't do much here without distro-specific knowledge
--	    # such as whether/how to invoke DHCP, set up bridging, etc.
--
--	    # RedHat and similar
- 	    if [ -x /sbin/ifup ]; then
- 		debug_mesg invoke ifup $INTERFACE
- 		exec /sbin/ifup $INTERFACE
-@@ -52,6 +47,27 @@
-     mesg $1 $ACTION event not handled
-     ;;
- 
-+unregister)
-+    case $INTERFACE in
-+	# interfaces that are unregistered after being "down"
-+	ppp*|ippp*|isdn*|plip*|lo*|irda*|dummy*)
-+	    debug_mesg assuming $INTERFACE is already down
-+	    exit 0
-+	    ;;
-+
-+	# interfaces that are registered then brought down
-+	*)
-+	    if [ -x /sbin/ifdown ]; then
-+		debug_mesg invoke ifdown $INTERFACE
-+		exec /sbin/ifdown $INTERFACE
-+	    else
-+		mesg "how do I bring interfaces up on this distro?"
-+	    fi
-+	    ;;
-+	
-+    esac
-+    mesg $1 $ACTION event not handled
-+    ;;
- *)
-     debug_mesg NET $ACTION event not supported
-     exit 1 ;;
---- hotplug-2003_05_01/etc/hotplug/scsi.agent~busybox
-+++ hotplug-2003_05_01/etc/hotplug/scsi.agent
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # SCSI hotplug agent for 2.5 kernels 
- #
-@@ -7,7 +7,7 @@
- #
- 
- cd /etc/hotplug
--. hotplug.functions
-+. ./hotplug.functions
- 
- case $ACTION in
- 
---- hotplug-2003_05_01/etc/hotplug/usb.handmap~busybox
-+++ hotplug-2003_05_01/etc/hotplug/usb.handmap
-@@ -3,7 +3,7 @@
- # with special driver mappings that the kernel
- # for some reason does not expose through modutils
- #
--# Comments get read by bash so dont use punctuation
-+# Comments get read by the shell so dont use punctuation
- # RETEST ESPECIALLY AFER CHANGES TO COMMENTS
- #
- #
---- hotplug-2003_05_01/etc/hotplug.d/default/default.hotplug~busybox
-+++ hotplug-2003_05_01/etc/hotplug.d/default/default.hotplug
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # This version of /sbin/hotplug should works on most GNU/Linux systems
- # using Linux 2.2.18+ or 2.4.* kernels.  On 2.2.*, only USB has such
-@@ -24,7 +24,7 @@
- #
- 
- cd /etc/hotplug
--. hotplug.functions
-+. ./hotplug.functions
- 
- # DEBUG=yes export DEBUG
- 
---- hotplug-2003_05_01/etc/hotplug/hotplug.functions~busybox
-+++ hotplug-2003_05_01/etc/hotplug/hotplug.functions
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # Setup and utility functions for use in hotplug agents
- #
-@@ -25,7 +25,7 @@
- #
- # for diagnostics
- #
--if [ -t -o ! -x /usr/bin/logger ]; then
-+if [ ! -x /usr/bin/logger ]; then
-     mesg () {
- 	echo "$@"
-     }
-@@ -40,15 +40,9 @@
-     mesg "$@"
- }
- 
--#
--# The modules.*map parsing uses BASH ("declare -i") and some version
--# of AWK, typically /bin/gawk.  Most GNU/Linux distros have these,
--# but some specialized ones (floppy based, etc) may not.  ("type -p"
--# is also a bash-ism, more robust than "which".)
--#
--AWK=`type -p gawk`
-+AWK=`which gawk`
- if [ "$AWK" = "" ]; then
--    AWK=`type -p awk`
-+    AWK=`which awk`
- fi
- 
- 
---- hotplug-2003_05_01/etc/hotplug/usb.rc~busybox
-+++ hotplug-2003_05_01/etc/hotplug/usb.rc
-@@ -75,7 +75,7 @@
- 	#
- 
- 	# synthesize hotplug events if we can 
--	# we need (non-bash) programs to parse descriptors.
-+	# we need (non-shell) programs to parse descriptors.
- 	LISTER=`type -p usbmodules`
- 	if [ "$LISTER" = "" -o ! -f /proc/bus/usb/devices ]; then
- 		echo $"** can't synthesize root hub events"
---- hotplug-2003_05_01/etc/hotplug/ieee1394.agent~busybox
-+++ hotplug-2003_05_01/etc/hotplug/ieee1394.agent
-@@ -24,7 +24,7 @@
- #
- 
- cd /etc/hotplug
--. hotplug.functions
-+. ./hotplug.functions
- # DEBUG=yes export DEBUG
- 
- # generated by modutils 2.4.9 or later, for 2.4.10 and later kernels
---- hotplug-2003_05_01/etc/hotplug/pci.agent~busybox
-+++ hotplug-2003_05_01/etc/hotplug/pci.agent
-@@ -33,7 +33,7 @@
- #
- 
- cd /etc/hotplug
--. hotplug.functions
-+. ./hotplug.functions
- 
- # generated by modutils, for current 2.4.x kernels
- MAP_CURRENT=$MODULE_DIR/modules.pcimap
---- hotplug-2003_05_01/etc/hotplug/usb.agent~busybox
-+++ hotplug-2003_05_01/etc/hotplug/usb.agent
-@@ -79,7 +79,7 @@
- fi
- 
- cd /etc/hotplug
--. hotplug.functions
-+. ./hotplug.functions
- # DEBUG=yes export DEBUG
- 
- # generated by modutils, for current 2.4.x (and later) kernels
---- hotplug-2003_05_01/etc/hotplug/pci.rc~busybox
-+++ hotplug-2003_05_01/etc/hotplug/pci.rc
-@@ -17,7 +17,7 @@
- 	. /etc/rc.d/init.d/functions
- fi
- 
--. hotplug.functions
-+. ./hotplug.functions
- 
- 
- # # override any of the defaults?
diff --git a/hotplug/hotplug-20030805/busybox.patch b/hotplug/hotplug-20030805/busybox.patch
deleted file mode 100644
index bc098bb45a..0000000000
--- a/hotplug/hotplug-20030805/busybox.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- hotplug-2003_08_05/etc/hotplug.d/default/default.hotplug~busybox
-+++ hotplug-2003_08_05/etc/hotplug.d/default/default.hotplug
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # This version of /sbin/hotplug should works on most GNU/Linux systems
- # using Linux 2.2.18+ or 2.4.* kernels.  On 2.2.*, only USB has such
-@@ -24,7 +24,7 @@
- #
- 
- cd /etc/hotplug
--. hotplug.functions
-+. ./hotplug.functions
- 
- # DEBUG=yes export DEBUG
- 
---- hotplug-2003_08_05/etc/hotplug/ieee1394.agent~busybox
-+++ hotplug-2003_08_05/etc/hotplug/ieee1394.agent
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # IEEE1394-specific hotplug policy agent.
- #
-@@ -24,7 +24,7 @@
- #
- 
- cd /etc/hotplug
--. hotplug.functions
-+. ./hotplug.functions
- # DEBUG=yes export DEBUG
- 
- # generated by modutils 2.4.9 or later, for 2.4.10 and later kernels
---- hotplug-2003_08_05/etc/hotplug/net.agent~busybox
-+++ hotplug-2003_08_05/etc/hotplug/net.agent
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # Network hotplug policy agent for Linux 2.4 kernels
- #
-@@ -17,7 +17,7 @@
- #
- 
- cd /etc/hotplug
--. hotplug.functions
-+. ./hotplug.functions
- # DEBUG=yes export DEBUG
- 
- if [ "$INTERFACE" = "" ]; then
---- hotplug-2003_08_05/etc/hotplug/pci.agent~busybox
-+++ hotplug-2003_08_05/etc/hotplug/pci.agent
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # PCI-specific hotplug policy agent.
- #
-@@ -33,7 +33,7 @@
- #
- 
- cd /etc/hotplug
--. hotplug.functions
-+. ./hotplug.functions
- 
- # generated by modutils, for current 2.4.x kernels
- MAP_CURRENT=$MODULE_DIR/modules.pcimap
---- hotplug-2003_08_05/etc/hotplug/scsi.agent~busybox
-+++ hotplug-2003_08_05/etc/hotplug/scsi.agent
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # SCSI hotplug agent for 2.5 kernels 
- #
-@@ -7,7 +7,7 @@
- #
- 
- cd /etc/hotplug
--. hotplug.functions
-+. ./hotplug.functions
- 
- case $ACTION in
- 
---- hotplug-2003_08_05/etc/hotplug/usb.agent~busybox
-+++ hotplug-2003_08_05/etc/hotplug/usb.agent
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # USB-specific hotplug policy agent.
- #
-@@ -79,7 +79,7 @@
- fi
- 
- cd /etc/hotplug
--. hotplug.functions
-+. ./hotplug.functions
- # DEBUG=yes export DEBUG
- 
- # generated by modutils, for current 2.4.x (and later) kernels
---- hotplug-2003_08_05/etc/hotplug/usb.handmap~busybox
-+++ hotplug-2003_08_05/etc/hotplug/usb.handmap
-@@ -3,7 +3,7 @@
- # with special driver mappings that the kernel
- # for some reason does not expose through modutils
- #
--# Comments get read by bash so dont use punctuation
-+# Comments get read by the shell so dont use punctuation
- # RETEST ESPECIALLY AFER CHANGES TO COMMENTS
- #
- #
---- hotplug-2003_08_05/etc/hotplug/usb.usermap~busybox
-+++ hotplug-2003_08_05/etc/hotplug/usb.usermap
-@@ -1 +0,0 @@
--# usb module         match_flags idVendor idProduct bcdDevice_lo bcdDevice_hi bDeviceClass bDeviceSubClass bDeviceProtocol bInterfaceClass bInterfaceSubClass bInterfaceProtocol driver_info
diff --git a/hotplug/hotplug-20040105/busybox.patch b/hotplug/hotplug-20040105/busybox.patch
deleted file mode 100644
index bc098bb45a..0000000000
--- a/hotplug/hotplug-20040105/busybox.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- hotplug-2003_08_05/etc/hotplug.d/default/default.hotplug~busybox
-+++ hotplug-2003_08_05/etc/hotplug.d/default/default.hotplug
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # This version of /sbin/hotplug should works on most GNU/Linux systems
- # using Linux 2.2.18+ or 2.4.* kernels.  On 2.2.*, only USB has such
-@@ -24,7 +24,7 @@
- #
- 
- cd /etc/hotplug
--. hotplug.functions
-+. ./hotplug.functions
- 
- # DEBUG=yes export DEBUG
- 
---- hotplug-2003_08_05/etc/hotplug/ieee1394.agent~busybox
-+++ hotplug-2003_08_05/etc/hotplug/ieee1394.agent
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # IEEE1394-specific hotplug policy agent.
- #
-@@ -24,7 +24,7 @@
- #
- 
- cd /etc/hotplug
--. hotplug.functions
-+. ./hotplug.functions
- # DEBUG=yes export DEBUG
- 
- # generated by modutils 2.4.9 or later, for 2.4.10 and later kernels
---- hotplug-2003_08_05/etc/hotplug/net.agent~busybox
-+++ hotplug-2003_08_05/etc/hotplug/net.agent
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # Network hotplug policy agent for Linux 2.4 kernels
- #
-@@ -17,7 +17,7 @@
- #
- 
- cd /etc/hotplug
--. hotplug.functions
-+. ./hotplug.functions
- # DEBUG=yes export DEBUG
- 
- if [ "$INTERFACE" = "" ]; then
---- hotplug-2003_08_05/etc/hotplug/pci.agent~busybox
-+++ hotplug-2003_08_05/etc/hotplug/pci.agent
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # PCI-specific hotplug policy agent.
- #
-@@ -33,7 +33,7 @@
- #
- 
- cd /etc/hotplug
--. hotplug.functions
-+. ./hotplug.functions
- 
- # generated by modutils, for current 2.4.x kernels
- MAP_CURRENT=$MODULE_DIR/modules.pcimap
---- hotplug-2003_08_05/etc/hotplug/scsi.agent~busybox
-+++ hotplug-2003_08_05/etc/hotplug/scsi.agent
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # SCSI hotplug agent for 2.5 kernels 
- #
-@@ -7,7 +7,7 @@
- #
- 
- cd /etc/hotplug
--. hotplug.functions
-+. ./hotplug.functions
- 
- case $ACTION in
- 
---- hotplug-2003_08_05/etc/hotplug/usb.agent~busybox
-+++ hotplug-2003_08_05/etc/hotplug/usb.agent
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # USB-specific hotplug policy agent.
- #
-@@ -79,7 +79,7 @@
- fi
- 
- cd /etc/hotplug
--. hotplug.functions
-+. ./hotplug.functions
- # DEBUG=yes export DEBUG
- 
- # generated by modutils, for current 2.4.x (and later) kernels
---- hotplug-2003_08_05/etc/hotplug/usb.handmap~busybox
-+++ hotplug-2003_08_05/etc/hotplug/usb.handmap
-@@ -3,7 +3,7 @@
- # with special driver mappings that the kernel
- # for some reason does not expose through modutils
- #
--# Comments get read by bash so dont use punctuation
-+# Comments get read by the shell so dont use punctuation
- # RETEST ESPECIALLY AFER CHANGES TO COMMENTS
- #
- #
---- hotplug-2003_08_05/etc/hotplug/usb.usermap~busybox
-+++ hotplug-2003_08_05/etc/hotplug/usb.usermap
-@@ -1 +0,0 @@
--# usb module         match_flags idVendor idProduct bcdDevice_lo bcdDevice_hi bDeviceClass bDeviceSubClass bDeviceProtocol bInterfaceClass bInterfaceSubClass bInterfaceProtocol driver_info
diff --git a/hotplug/hotplug-20040311/fix-net.agent b/hotplug/hotplug-20040311/fix-net.agent
deleted file mode 100644
index 3bc0935018..0000000000
--- a/hotplug/hotplug-20040311/fix-net.agent
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh -e
-#
-# Since ifupdown of Debian is different than one of RedHat.
-# So we need to fix it
-
-topdir=$1
-dir=$topdir/etc/hotplug
-test -f $dir/net.agent || exit 1
-mv $dir/net.agent $dir/net.agent.orig
-
-sed -e '/^\*)/i\
-unregister)\
-    # Assume that we want to run ifdown no matter what,  \
-    # because it is not going to remove the data from the \
-    # ifstate database otherwise.\
-    if [ -x /sbin/ifdown ]; then\
-       debug_mesg invoke ifdown $INTERFACE\
-        exec /sbin/ifdown $INTERFACE\
-    else\
-       # mesg "how do I bring interfaces up on this distro?"\
-       mesg "E: /sbin/ifdown not found. You need to install ifupdown package"\
-    fi\
-    mesg $1 $ACTION event not handled\
-    ;;\
-' $dir/net.agent.orig > $dir/net.agent
-rm -f $dir/net.agent.orig
-chmod 755 $dir/net.agent
-exit 0
-
diff --git a/hotplug/hotplug-20040311/logcheck-ignore b/hotplug/hotplug-20040311/logcheck-ignore
deleted file mode 100644
index b941353041..0000000000
--- a/hotplug/hotplug-20040311/logcheck-ignore
+++ /dev/null
@@ -1 +0,0 @@
-net.agent: invoke if(up|down)
diff --git a/hotplug/hotplug-20040311/update-usb.usermap b/hotplug/hotplug-20040311/update-usb.usermap
deleted file mode 100644
index d09e1176ec..0000000000
--- a/hotplug/hotplug-20040311/update-usb.usermap
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh -e
-# update-usb.usermap
-# Copyright (c) 2001 Fumitoshi UKAI <ukai@debian.or.jp>
-# GPL
-
-LIBDIR=/usr/lib/hotplug
-USERMAP=/etc/hotplug/usb.usermap
-LOCALMAP=/etc/hotplug/usb.usermap.local
-
-test -d $LIBDIR || exit 0
-
-echo -n "Updating $USERMAP ..."
-
-echo "# usb.usermap file" > $USERMAP
-echo "# This is autogenerated by update-usb.usermap program" >> $USERMAP
-echo "# usb module         match_flags idVendor idProduct bcdDevice_lo bcdDevice_hi bDeviceClass bDeviceSubClass bDeviceProtocol bInterfaceClass bInterfaceSubClass bInterfaceProtocol driver_info" >> $USERMAP
-
-if [ -f $LOCALMAP ]; then
-   echo "# usb.usermap.local" >> $USERMAP
-   cat $LOCALMAP >> $USERMAP
-fi
-
-cd $LIBDIR
-for package in *
-do
-  if [ -d "$package" ]; then
-      map=$package/usb.usermap
-      echo "# $package" >> $USERMAP
-      if [ -x "$map" ]; then
-	  ./$map >> $USERMAP
-      elif [ -f "$map" ]; then
-	  cat $map >> $USERMAP
-      fi
-  fi
-done
-
-echo done.
diff --git a/hotplug/hotplug_20030501.oe b/hotplug/hotplug_20030501.oe
deleted file mode 100644
index 0bd0d58caf..0000000000
--- a/hotplug/hotplug_20030501.oe
+++ /dev/null
@@ -1,22 +0,0 @@
-SECTION = "base"
-DESCRIPTION = " This package contains the scripts necessary \
-for hotplug Linux support, and lets you plug in new devices \
-and use them immediately."
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/linux-hotplug/hotplug-2003_05_01.tar.gz \
-	   file://busybox.patch;patch=1"
-S = "${WORKDIR}/hotplug-2003_05_01"
-
-do_compile () {
-	oenote "Nothing to compile."
-}
-
-do_install () {
-	install -d ${D}/sbin ${D}/${sysconfdir}/hotplug \
-		   ${D}/${sysconfdir}/logcheck/ignore.d \
-		   ${D}/${sbindir}
-	oe_runmake prefix=${D} install
-	sh debian/fix-net.agent ${D}
-	install -m 0755 debian/update-usb.usermap ${D}/${sbindir}/
-	install -m 0644 debian/logcheck-ignore ${D}/${sysconfdir}/logcheck/ignore.d/hotplug
-}
diff --git a/hotplug/hotplug_20030805.oe b/hotplug/hotplug_20030805.oe
deleted file mode 100644
index 3604469daf..0000000000
--- a/hotplug/hotplug_20030805.oe
+++ /dev/null
@@ -1,22 +0,0 @@
-SECTION = "base"
-DESCRIPTION = "This package contains the scripts necessary \
-for hotplug Linux support, and lets you plug in new devices \
-and use them immediately."
-SRC_URI = "${SOURCEFORGE_MIRROR}/linux-hotplug/hotplug-2003_08_05.tar.gz \
-	   file://busybox.patch;patch=1"
-S = "${WORKDIR}/hotplug-2003_08_05"
-
-do_compile () {
-	oenote "Nothing to compile."
-}
-
-DEBFIX = "sed -e 's:sysconfig/usb:default/hotplug.usb:'"
-do_install () {
-	install -d ${D}/sbin ${D}/${sysconfdir}/hotplug \
-		   ${D}/${sysconfdir}/logcheck/ignore.d \
-		   ${D}/${sbindir}
-	oe_runmake prefix=${D} install
-	sh debian/fix-net.agent ${D}
-	install -m 0755 debian/update-usb.usermap ${D}/${sbindir}/
-	install -m 0644 debian/logcheck-ignore ${D}/${sysconfdir}/logcheck/ignore.d/hotplug
-}
diff --git a/hotplug/hotplug_20040105.oe b/hotplug/hotplug_20040105.oe
deleted file mode 100644
index 3a0997e901..0000000000
--- a/hotplug/hotplug_20040105.oe
+++ /dev/null
@@ -1,22 +0,0 @@
-SECTION = "base"
-DESCRIPTION = "This package contains the scripts necessary \
-for hotplug Linux support, and lets you plug in new devices \
-and use them immediately."
-SRC_URI = "${SOURCEFORGE_MIRROR}/linux-hotplug/hotplug-2004_01_05.tar.gz \
-	   file://busybox.patch;patch=1"
-S = "${WORKDIR}/hotplug-2004_01_05"
-
-do_compile () {
-	oenote "Nothing to compile."
-}
-
-DEBFIX = "sed -e 's:sysconfig/usb:default/hotplug.usb:'"
-do_install () {
-	install -d ${D}/sbin ${D}/${sysconfdir}/hotplug \
-		   ${D}/${sysconfdir}/logcheck/ignore.d \
-		   ${D}/${sbindir}
-	oe_runmake prefix=${D} install
-	sh debian/fix-net.agent ${D}
-	install -m 0755 debian/update-usb.usermap ${D}/${sbindir}/
-	install -m 0644 debian/logcheck-ignore ${D}/${sysconfdir}/logcheck/ignore.d/hotplug
-}
diff --git a/hotplug/hotplug_20040311.oe b/hotplug/hotplug_20040311.oe
deleted file mode 100644
index 5649918002..0000000000
--- a/hotplug/hotplug_20040311.oe
+++ /dev/null
@@ -1,32 +0,0 @@
-SECTION = "base"
-DESCRIPTION = "This package contains the scripts necessary \
-for hotplug Linux support, and lets you plug in new devices \
-and use them immediately."
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_03_11.tar.gz \
-           file://fix-net.agent \
-           file://update-usb.usermap \
-           file://logcheck-ignore"
-S = "${WORKDIR}/hotplug-2004_03_11"
-
-do_compile () {
-	:
-}
-
-oldmandir := "${mandir}"
-oldsbindir := "${sbindir}"
-prefix = ""
-exec_prefix = ""
-FILES_hotplug_append = " ${oldsbindir}"
-FILES_hotplug-doc_append = " ${oldmandir}"
-
-export DEBFIX = "sed -e 's:sysconfig/usb:default/hotplug.usb:'"
-do_install () {
-	install -d ${D}/${sysconfdir}/logcheck/ignore.d \
-		   ${D}/${oldmandir} ${D}/${oldsbindir}
-	oe_runmake prefix=${D}${prefix} exec_prefix=${D}${exec_prefix} \
-		   etcdir=${D}${sysconfdir} sbindir=${D}${sbindir} \
-		   mandir=${D}${oldmandir} install
-	sh ${WORKDIR}/fix-net.agent ${D}
-	install -m 0755 ${WORKDIR}/update-usb.usermap ${D}/${oldsbindir}/
-	install -m 0644 ${WORKDIR}/logcheck-ignore ${D}/${sysconfdir}/logcheck/ignore.d/hotplug
-}
diff --git a/hotplug/hotplug_20040920.oe b/hotplug/hotplug_20040920.oe
index 722089b8ad..6b340316f1 100644
--- a/hotplug/hotplug_20040920.oe
+++ b/hotplug/hotplug_20040920.oe
@@ -1,13 +1,18 @@
-SECTION = "base"
 DESCRIPTION = "This package contains the scripts necessary \
 for hotplug Linux support, and lets you plug in new devices \
 and use them immediately."
+SECTION = "base"
+PR = "r1"
+
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_09_20.tar.gz \
            file://fix-net.agent \
            file://update-usb.usermap \
            file://logcheck-ignore \
-	   file://sleeve.agent file://sleeve.rc file://mmc.agent \
-	   file://usbd.agent"
+	   file://sleeve.agent \
+	   file://sleeve.rc \
+	   file://mmc.agent \
+	   file://usbd.agent \
+	   file://usbd"
 S = "${WORKDIR}/hotplug-2004_09_20"
 
 INITSCRIPT_NAME = "hotplug"
@@ -28,8 +33,10 @@ FILES_hotplug-doc_append = " ${oldmandir}"
 
 export DEBFIX = "sed -e 's:sysconfig/usb:default/hotplug.usb:'"
 do_install () {
-	install -d ${D}/${sysconfdir}/logcheck/ignore.d \
-		   ${D}/${oldmandir} ${D}/${oldsbindir}
+	install -d ${D}/${sysconfdir}/logcheck/ignore.d
+	install -d ${D}/${oldmandir}
+	install -d ${D}/${oldsbindir}
+	install -d ${D}/${sysconfdir}/default
 	oe_runmake prefix=${D}${prefix} exec_prefix=${D}${exec_prefix} \
 		   etcdir=${D}${sysconfdir} sbindir=${D}${sbindir} \
 		   mandir=${D}${oldmandir} install
@@ -40,4 +47,5 @@ do_install () {
 	install -m 0755 ${WORKDIR}/sleeve.rc ${D}${sysconfdir}/hotplug/
 	install -m 0755 ${WORKDIR}/mmc.agent ${D}${sysconfdir}/hotplug/
 	install -m 0755 ${WORKDIR}/usbd.agent ${D}${sysconfdir}/hotplug/
+	install -m 0755 ${WORKDIR}/usbd ${D}${sysconfdir}/default/usbd
 }