import clean BK tree at cset 1.3670

9 files changed, 191 insertions, 0 deletions

diff --git a/packages/linux-hotplug/linux-hotplug-20040920/.mtn2git_empty b/packages/linux-hotplug/linux-hotplug-20040920/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux-hotplug/linux-hotplug-20040920/.mtn2git_empty
diff --git a/packages/linux-hotplug/linux-hotplug-20040920/fix-net.agent b/packages/linux-hotplug/linux-hotplug-20040920/fix-net.agent
index e69de29bb2..3bc0935018 100644
--- a/packages/linux-hotplug/linux-hotplug-20040920/fix-net.agent
+++ b/packages/linux-hotplug/linux-hotplug-20040920/fix-net.agent
@@ -0,0 +1,29 @@
+#!/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/packages/linux-hotplug/linux-hotplug-20040920/hotplug-net-agent-usb.patch b/packages/linux-hotplug/linux-hotplug-20040920/hotplug-net-agent-usb.patch
index e69de29bb2..a64fc50d2b 100644
--- a/packages/linux-hotplug/linux-hotplug-20040920/hotplug-net-agent-usb.patch
+++ b/packages/linux-hotplug/linux-hotplug-20040920/hotplug-net-agent-usb.patch
@@ -0,0 +1,43 @@
+--- hotplug/etc/hotplug/net.agent	2005-01-13 21:12:47.143597392 +1300
++++ hotplug/etc/hotplug/net.agent	2005-01-13 21:17:57.095477544 +1300
+@@ -41,6 +41,9 @@
+ 	    debug_mesg assuming $INTERFACE is already up
+ 	    exit 0
+ 	    ;;
++	# interfaces that don't go up until attached
++	usbf)
++	    ;;
+ 	# interfaces that are registered then brought up
+ 	*)
+ 	    # NOTE:  network configuration relies on administered state,
+@@ -83,6 +86,13 @@
+     mesg $1 $ACTION event not handled
+     ;;
+ 
++attach)
++    # ifupdown is dumb and won't bring up an interface that it thinks
++    # might already be configured.
++    /sbin/ifdown $INTERFACE
++    exec /sbin/ifup $INTERFACE
++    ;;
++
+ remove|unregister)
+     case $INTERFACE in
+ 	# interfaces that are unregistered after being "down" (?)
+@@ -105,6 +115,16 @@
+     mesg $1 $ACTION event not handled
+     ;;
+ 
++detach)
++    if [ -x /sbin/ifdown ]; then
++        debug_mesg invoke ifdown $INTERFACE
++        exec /sbin/ifdown $INTERFACE
++    else
++        mesg "E: /sbin/ifdown not found. You need to install ifupdown package"
++    fi
++    mesg $1 $ACTION event not handled
++    ;;
++
+ *)
+     debug_mesg NET $ACTION event for $INTERFACE not supported
+     exit 1 ;;
diff --git a/packages/linux-hotplug/linux-hotplug-20040920/isapnp-exit.diff b/packages/linux-hotplug/linux-hotplug-20040920/isapnp-exit.diff
index e69de29bb2..e5a9ab10af 100644
--- a/packages/linux-hotplug/linux-hotplug-20040920/isapnp-exit.diff
+++ b/packages/linux-hotplug/linux-hotplug-20040920/isapnp-exit.diff
@@ -0,0 +1,11 @@
+--- hotplug-2004_09_20/etc/hotplug/isapnp.rc.orig	2004-12-20 15:01:21.541446000 +0100
++++ hotplug-2004_09_20/etc/hotplug/isapnp.rc	2004-12-20 15:01:32.625760928 +0100
+@@ -13,7 +13,7 @@
+ #
+ 
+ # only 2.6 kernels are supported
+-[ -d /sys/bus/pnp/devices/ ] || return 0
++[ -d /sys/bus/pnp/devices/ ] || exit 0
+ 
+ cd /etc/hotplug
+ . ./hotplug.functions
diff --git a/packages/linux-hotplug/linux-hotplug-20040920/logcheck-ignore b/packages/linux-hotplug/linux-hotplug-20040920/logcheck-ignore
index e69de29bb2..b941353041 100644
--- a/packages/linux-hotplug/linux-hotplug-20040920/logcheck-ignore
+++ b/packages/linux-hotplug/linux-hotplug-20040920/logcheck-ignore
@@ -0,0 +1 @@
+net.agent: invoke if(up|down)
diff --git a/packages/linux-hotplug/linux-hotplug-20040920/update-usb.usermap b/packages/linux-hotplug/linux-hotplug-20040920/update-usb.usermap
index e69de29bb2..d09e1176ec 100644..100755
--- a/packages/linux-hotplug/linux-hotplug-20040920/update-usb.usermap
+++ b/packages/linux-hotplug/linux-hotplug-20040920/update-usb.usermap
@@ -0,0 +1,37 @@
+#!/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/packages/linux-hotplug/linux-hotplug-20040920/usb-storage b/packages/linux-hotplug/linux-hotplug-20040920/usb-storage
index e69de29bb2..138790a367 100644
--- a/packages/linux-hotplug/linux-hotplug-20040920/usb-storage
+++ b/packages/linux-hotplug/linux-hotplug-20040920/usb-storage
@@ -0,0 +1,2 @@
+#!/bin/sh
+modprobe sd_mod
\ No newline at end of file
diff --git a/packages/linux-hotplug/linux-hotplug-20040920/usbrc-busybox.patch b/packages/linux-hotplug/linux-hotplug-20040920/usbrc-busybox.patch
index e69de29bb2..35f43dc52b 100644
--- a/packages/linux-hotplug/linux-hotplug-20040920/usbrc-busybox.patch
+++ b/packages/linux-hotplug/linux-hotplug-20040920/usbrc-busybox.patch
@@ -0,0 +1,13 @@
+--- hotplug/etc/hotplug/usb.rc.old	2005-05-25 15:50:11.000000000 +0100
++++ hotplug/etc/hotplug/usb.rc	2005-05-25 15:50:59.000000000 +0100
+@@ -95,8 +95,8 @@
+ 			PRODUCT="$(cat $devlink/../idVendor)/$(cat $devlink/../idProduct)/$(cat $devlink/../bcdDevice)"
+ 		        if [ -f $devlink/../../devnum ]
+ 			then
+-			    devbus=$( ( echo -n 000 ; cat $devlink/../../devnum ) | grep -o ...\$ )
+-			    devdev=$( ( echo -n 000 ; cat $devlink/../devnum ) | grep -o ...\$ )
++			    devbus=$( ( echo -n 000 ; cat $devlink/../../devnum ) | sed 's/.*\(...\)$/\1/' )
++			    devdev=$( ( echo -n 000 ; cat $devlink/../devnum ) | sed 's/.*\(...\)$/\1/' )
+ 			    DEVICE="/proc/bus/usb/$devbus/$devdev"
+ 			else
+ 			    DEVICE=
diff --git a/packages/linux-hotplug/linux-hotplug-20040920/userspecified_hcd.patch b/packages/linux-hotplug/linux-hotplug-20040920/userspecified_hcd.patch
index e69de29bb2..c2ceeb686e 100644
--- a/packages/linux-hotplug/linux-hotplug-20040920/userspecified_hcd.patch
+++ b/packages/linux-hotplug/linux-hotplug-20040920/userspecified_hcd.patch
@@ -0,0 +1,55 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- hotplug-2004_09_20/etc/hotplug/usb.rc~userspecified_hcd.patch
++++ hotplug-2004_09_20/etc/hotplug/usb.rc
+@@ -24,6 +24,7 @@
+ unset I_WANT_A_BROKEN_PS
+ PS_PERSONALITY=linux
+ 
++HCD=
+ STATIC_MODULE_LIST=
+ X11_USBMICE_HACK=false
+ 
+@@ -166,20 +167,25 @@
+     # FIXME: some of this should be driven by PCI hotplugging, and have
+     # the blacklist control which uhci driver gets used (before 2.5).
+ 
+-    # "new style" HCDs ... more common code
+-    modprobe -q ehci-hcd >/dev/null 2>&1
+-    modprobe -q ohci-hcd >/dev/null 2>&1
+-    modprobe -q uhci-hcd >/dev/null 2>&1
+-
+-    # "old style" HCDs ... more driver-specific bugs
+-    modprobe -q usb-ohci >/dev/null 2>&1
+-    # NOTE: this prefers "uhci"; you may prefer "usb-uhci".
+-    # modprobe -q usb-uhci >/dev/null 2>&1 || modprobe -q uhci >/dev/null 2>&1
+-    modprobe -q uhci >/dev/null 2>&1 || modprobe -q usb-uhci >/dev/null 2>&1
+-
+-    # ... add any non-PCI HCDS here.  Examples include the
+-    # CRIS usb-host, Philips ISP-1161, Symlogic 811HS, and so on.
+-    # ohci-hcd can handle some non-pci variants.
++    # If the user specified which HCD they want, trust them.
++    if [ -n "$HCD" ]; then
++        modprobe -q $HCD >/dev/null 2>&1
++    else
++        # "new style" HCDs ... more common code
++        modprobe -q ehci-hcd >/dev/null 2>&1
++        modprobe -q ohci-hcd >/dev/null 2>&1
++        modprobe -q uhci-hcd >/dev/null 2>&1
++    
++        # "old style" HCDs ... more driver-specific bugs
++        modprobe -q usb-ohci >/dev/null 2>&1
++        # NOTE: this prefers "uhci"; you may prefer "usb-uhci".
++        # modprobe -q usb-uhci >/dev/null 2>&1 || modprobe -q uhci >/dev/null 2>&1
++        modprobe -q uhci >/dev/null 2>&1 || modprobe -q usb-uhci >/dev/null 2>&1
++    
++        # ... add any non-PCI HCDS here.  Examples include the
++        # CRIS usb-host, Philips ISP-1161, Symlogic 811HS, and so on.
++        # ohci-hcd can handle some non-pci variants.
++    fi
+ 
+     if [ -d /proc/bus/usb ]; then
+ 	# If we see there are no busses, we "failed" and