diff options
Diffstat (limited to 'meta/packages/linux-hotplug/linux-hotplug-20040920')
9 files changed, 0 insertions, 208 deletions
diff --git a/meta/packages/linux-hotplug/linux-hotplug-20040920/dash.patch b/meta/packages/linux-hotplug/linux-hotplug-20040920/dash.patch deleted file mode 100644 index 161671f2e2..0000000000 --- a/meta/packages/linux-hotplug/linux-hotplug-20040920/dash.patch +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | Index: hotplug-2004_09_20/Makefile | ||
| 2 | =================================================================== | ||
| 3 | --- hotplug-2004_09_20.orig/Makefile 2006-11-29 17:01:16.000000000 +0100 | ||
| 4 | +++ hotplug-2004_09_20/Makefile 2006-11-29 17:04:39.000000000 +0100 | ||
| 5 | @@ -86,10 +86,10 @@ | ||
| 6 | ${INSTALL_SCRIPT} -D sbin/hotplug $(sbindir)/hotplug | ||
| 7 | $(INSTALL) -d $(etcdir)/hotplug/{usb,pci} | ||
| 8 | $(INSTALL) -D etc/hotplug.d/default/default.hotplug $(etcdir)/hotplug.d/default/default.hotplug | ||
| 9 | - for F in etc/hotplug/{*.{agent,rc},hotplug.functions} ; do \ | ||
| 10 | + for F in etc/hotplug/*.agent etc/hotplug/*.rc etc/hotplug/hotplug.functions ; do \ | ||
| 11 | ${INSTALL_SCRIPT} $$F $(etcdir)/hotplug ; \ | ||
| 12 | done | ||
| 13 | - for F in etc/hotplug/{blacklist,usb.{user,hand,dist}map} ; do \ | ||
| 14 | + for F in etc/hotplug/blacklist etc/hotplug/usb.*map ; do \ | ||
| 15 | ${INSTALL_DATA} $$F $(etcdir)/hotplug ; \ | ||
| 16 | done | ||
| 17 | ${INSTALL_SCRIPT} -D etc/rc.d/init.d/hotplug $(etcdir)/init.d/hotplug | ||
diff --git a/meta/packages/linux-hotplug/linux-hotplug-20040920/fix-net.agent b/meta/packages/linux-hotplug/linux-hotplug-20040920/fix-net.agent deleted file mode 100644 index 3bc0935018..0000000000 --- a/meta/packages/linux-hotplug/linux-hotplug-20040920/fix-net.agent +++ /dev/null | |||
| @@ -1,29 +0,0 @@ | |||
| 1 | #!/bin/sh -e | ||
| 2 | # | ||
| 3 | # Since ifupdown of Debian is different than one of RedHat. | ||
| 4 | # So we need to fix it | ||
| 5 | |||
| 6 | topdir=$1 | ||
| 7 | dir=$topdir/etc/hotplug | ||
| 8 | test -f $dir/net.agent || exit 1 | ||
| 9 | mv $dir/net.agent $dir/net.agent.orig | ||
| 10 | |||
| 11 | sed -e '/^\*)/i\ | ||
| 12 | unregister)\ | ||
| 13 | # Assume that we want to run ifdown no matter what, \ | ||
| 14 | # because it is not going to remove the data from the \ | ||
| 15 | # ifstate database otherwise.\ | ||
| 16 | if [ -x /sbin/ifdown ]; then\ | ||
| 17 | debug_mesg invoke ifdown $INTERFACE\ | ||
| 18 | exec /sbin/ifdown $INTERFACE\ | ||
| 19 | else\ | ||
| 20 | # mesg "how do I bring interfaces up on this distro?"\ | ||
| 21 | mesg "E: /sbin/ifdown not found. You need to install ifupdown package"\ | ||
| 22 | fi\ | ||
| 23 | mesg $1 $ACTION event not handled\ | ||
| 24 | ;;\ | ||
| 25 | ' $dir/net.agent.orig > $dir/net.agent | ||
| 26 | rm -f $dir/net.agent.orig | ||
| 27 | chmod 755 $dir/net.agent | ||
| 28 | exit 0 | ||
| 29 | |||
diff --git a/meta/packages/linux-hotplug/linux-hotplug-20040920/hotplug-net-agent-usb.patch b/meta/packages/linux-hotplug/linux-hotplug-20040920/hotplug-net-agent-usb.patch deleted file mode 100644 index a64fc50d2b..0000000000 --- a/meta/packages/linux-hotplug/linux-hotplug-20040920/hotplug-net-agent-usb.patch +++ /dev/null | |||
| @@ -1,43 +0,0 @@ | |||
| 1 | --- hotplug/etc/hotplug/net.agent 2005-01-13 21:12:47.143597392 +1300 | ||
| 2 | +++ hotplug/etc/hotplug/net.agent 2005-01-13 21:17:57.095477544 +1300 | ||
| 3 | @@ -41,6 +41,9 @@ | ||
| 4 | debug_mesg assuming $INTERFACE is already up | ||
| 5 | exit 0 | ||
| 6 | ;; | ||
| 7 | + # interfaces that don't go up until attached | ||
| 8 | + usbf) | ||
| 9 | + ;; | ||
| 10 | # interfaces that are registered then brought up | ||
| 11 | *) | ||
| 12 | # NOTE: network configuration relies on administered state, | ||
| 13 | @@ -83,6 +86,13 @@ | ||
| 14 | mesg $1 $ACTION event not handled | ||
| 15 | ;; | ||
| 16 | |||
| 17 | +attach) | ||
| 18 | + # ifupdown is dumb and won't bring up an interface that it thinks | ||
| 19 | + # might already be configured. | ||
| 20 | + /sbin/ifdown $INTERFACE | ||
| 21 | + exec /sbin/ifup $INTERFACE | ||
| 22 | + ;; | ||
| 23 | + | ||
| 24 | remove|unregister) | ||
| 25 | case $INTERFACE in | ||
| 26 | # interfaces that are unregistered after being "down" (?) | ||
| 27 | @@ -105,6 +115,16 @@ | ||
| 28 | mesg $1 $ACTION event not handled | ||
| 29 | ;; | ||
| 30 | |||
| 31 | +detach) | ||
| 32 | + if [ -x /sbin/ifdown ]; then | ||
| 33 | + debug_mesg invoke ifdown $INTERFACE | ||
| 34 | + exec /sbin/ifdown $INTERFACE | ||
| 35 | + else | ||
| 36 | + mesg "E: /sbin/ifdown not found. You need to install ifupdown package" | ||
| 37 | + fi | ||
| 38 | + mesg $1 $ACTION event not handled | ||
| 39 | + ;; | ||
| 40 | + | ||
| 41 | *) | ||
| 42 | debug_mesg NET $ACTION event for $INTERFACE not supported | ||
| 43 | exit 1 ;; | ||
diff --git a/meta/packages/linux-hotplug/linux-hotplug-20040920/isapnp-exit.diff b/meta/packages/linux-hotplug/linux-hotplug-20040920/isapnp-exit.diff deleted file mode 100644 index e5a9ab10af..0000000000 --- a/meta/packages/linux-hotplug/linux-hotplug-20040920/isapnp-exit.diff +++ /dev/null | |||
| @@ -1,11 +0,0 @@ | |||
| 1 | --- hotplug-2004_09_20/etc/hotplug/isapnp.rc.orig 2004-12-20 15:01:21.541446000 +0100 | ||
| 2 | +++ hotplug-2004_09_20/etc/hotplug/isapnp.rc 2004-12-20 15:01:32.625760928 +0100 | ||
| 3 | @@ -13,7 +13,7 @@ | ||
| 4 | # | ||
| 5 | |||
| 6 | # only 2.6 kernels are supported | ||
| 7 | -[ -d /sys/bus/pnp/devices/ ] || return 0 | ||
| 8 | +[ -d /sys/bus/pnp/devices/ ] || exit 0 | ||
| 9 | |||
| 10 | cd /etc/hotplug | ||
| 11 | . ./hotplug.functions | ||
diff --git a/meta/packages/linux-hotplug/linux-hotplug-20040920/logcheck-ignore b/meta/packages/linux-hotplug/linux-hotplug-20040920/logcheck-ignore deleted file mode 100644 index b941353041..0000000000 --- a/meta/packages/linux-hotplug/linux-hotplug-20040920/logcheck-ignore +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | net.agent: invoke if(up|down) | ||
diff --git a/meta/packages/linux-hotplug/linux-hotplug-20040920/update-usb.usermap b/meta/packages/linux-hotplug/linux-hotplug-20040920/update-usb.usermap deleted file mode 100755 index d09e1176ec..0000000000 --- a/meta/packages/linux-hotplug/linux-hotplug-20040920/update-usb.usermap +++ /dev/null | |||
| @@ -1,37 +0,0 @@ | |||
| 1 | #!/bin/sh -e | ||
| 2 | # update-usb.usermap | ||
| 3 | # Copyright (c) 2001 Fumitoshi UKAI <ukai@debian.or.jp> | ||
| 4 | # GPL | ||
| 5 | |||
| 6 | LIBDIR=/usr/lib/hotplug | ||
| 7 | USERMAP=/etc/hotplug/usb.usermap | ||
| 8 | LOCALMAP=/etc/hotplug/usb.usermap.local | ||
| 9 | |||
| 10 | test -d $LIBDIR || exit 0 | ||
| 11 | |||
| 12 | echo -n "Updating $USERMAP ..." | ||
| 13 | |||
| 14 | echo "# usb.usermap file" > $USERMAP | ||
| 15 | echo "# This is autogenerated by update-usb.usermap program" >> $USERMAP | ||
| 16 | echo "# usb module match_flags idVendor idProduct bcdDevice_lo bcdDevice_hi bDeviceClass bDeviceSubClass bDeviceProtocol bInterfaceClass bInterfaceSubClass bInterfaceProtocol driver_info" >> $USERMAP | ||
| 17 | |||
| 18 | if [ -f $LOCALMAP ]; then | ||
| 19 | echo "# usb.usermap.local" >> $USERMAP | ||
| 20 | cat $LOCALMAP >> $USERMAP | ||
| 21 | fi | ||
| 22 | |||
| 23 | cd $LIBDIR | ||
| 24 | for package in * | ||
| 25 | do | ||
| 26 | if [ -d "$package" ]; then | ||
| 27 | map=$package/usb.usermap | ||
| 28 | echo "# $package" >> $USERMAP | ||
| 29 | if [ -x "$map" ]; then | ||
| 30 | ./$map >> $USERMAP | ||
| 31 | elif [ -f "$map" ]; then | ||
| 32 | cat $map >> $USERMAP | ||
| 33 | fi | ||
| 34 | fi | ||
| 35 | done | ||
| 36 | |||
| 37 | echo done. | ||
diff --git a/meta/packages/linux-hotplug/linux-hotplug-20040920/usb-storage b/meta/packages/linux-hotplug/linux-hotplug-20040920/usb-storage deleted file mode 100644 index 138790a367..0000000000 --- a/meta/packages/linux-hotplug/linux-hotplug-20040920/usb-storage +++ /dev/null | |||
| @@ -1,2 +0,0 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | modprobe sd_mod \ No newline at end of file | ||
diff --git a/meta/packages/linux-hotplug/linux-hotplug-20040920/usbrc-busybox.patch b/meta/packages/linux-hotplug/linux-hotplug-20040920/usbrc-busybox.patch deleted file mode 100644 index 35f43dc52b..0000000000 --- a/meta/packages/linux-hotplug/linux-hotplug-20040920/usbrc-busybox.patch +++ /dev/null | |||
| @@ -1,13 +0,0 @@ | |||
| 1 | --- hotplug/etc/hotplug/usb.rc.old 2005-05-25 15:50:11.000000000 +0100 | ||
| 2 | +++ hotplug/etc/hotplug/usb.rc 2005-05-25 15:50:59.000000000 +0100 | ||
| 3 | @@ -95,8 +95,8 @@ | ||
| 4 | PRODUCT="$(cat $devlink/../idVendor)/$(cat $devlink/../idProduct)/$(cat $devlink/../bcdDevice)" | ||
| 5 | if [ -f $devlink/../../devnum ] | ||
| 6 | then | ||
| 7 | - devbus=$( ( echo -n 000 ; cat $devlink/../../devnum ) | grep -o ...\$ ) | ||
| 8 | - devdev=$( ( echo -n 000 ; cat $devlink/../devnum ) | grep -o ...\$ ) | ||
| 9 | + devbus=$( ( echo -n 000 ; cat $devlink/../../devnum ) | sed 's/.*\(...\)$/\1/' ) | ||
| 10 | + devdev=$( ( echo -n 000 ; cat $devlink/../devnum ) | sed 's/.*\(...\)$/\1/' ) | ||
| 11 | DEVICE="/proc/bus/usb/$devbus/$devdev" | ||
| 12 | else | ||
| 13 | DEVICE= | ||
diff --git a/meta/packages/linux-hotplug/linux-hotplug-20040920/userspecified_hcd.patch b/meta/packages/linux-hotplug/linux-hotplug-20040920/userspecified_hcd.patch deleted file mode 100644 index c2ceeb686e..0000000000 --- a/meta/packages/linux-hotplug/linux-hotplug-20040920/userspecified_hcd.patch +++ /dev/null | |||
| @@ -1,55 +0,0 @@ | |||
| 1 | |||
| 2 | # | ||
| 3 | # Patch managed by http://www.holgerschurig.de/patcher.html | ||
| 4 | # | ||
| 5 | |||
| 6 | --- hotplug-2004_09_20/etc/hotplug/usb.rc~userspecified_hcd.patch | ||
| 7 | +++ hotplug-2004_09_20/etc/hotplug/usb.rc | ||
| 8 | @@ -24,6 +24,7 @@ | ||
| 9 | unset I_WANT_A_BROKEN_PS | ||
| 10 | PS_PERSONALITY=linux | ||
| 11 | |||
| 12 | +HCD= | ||
| 13 | STATIC_MODULE_LIST= | ||
| 14 | X11_USBMICE_HACK=false | ||
| 15 | |||
| 16 | @@ -166,20 +167,25 @@ | ||
| 17 | # FIXME: some of this should be driven by PCI hotplugging, and have | ||
| 18 | # the blacklist control which uhci driver gets used (before 2.5). | ||
| 19 | |||
| 20 | - # "new style" HCDs ... more common code | ||
| 21 | - modprobe -q ehci-hcd >/dev/null 2>&1 | ||
| 22 | - modprobe -q ohci-hcd >/dev/null 2>&1 | ||
| 23 | - modprobe -q uhci-hcd >/dev/null 2>&1 | ||
| 24 | - | ||
| 25 | - # "old style" HCDs ... more driver-specific bugs | ||
| 26 | - modprobe -q usb-ohci >/dev/null 2>&1 | ||
| 27 | - # NOTE: this prefers "uhci"; you may prefer "usb-uhci". | ||
| 28 | - # modprobe -q usb-uhci >/dev/null 2>&1 || modprobe -q uhci >/dev/null 2>&1 | ||
| 29 | - modprobe -q uhci >/dev/null 2>&1 || modprobe -q usb-uhci >/dev/null 2>&1 | ||
| 30 | - | ||
| 31 | - # ... add any non-PCI HCDS here. Examples include the | ||
| 32 | - # CRIS usb-host, Philips ISP-1161, Symlogic 811HS, and so on. | ||
| 33 | - # ohci-hcd can handle some non-pci variants. | ||
| 34 | + # If the user specified which HCD they want, trust them. | ||
| 35 | + if [ -n "$HCD" ]; then | ||
| 36 | + modprobe -q $HCD >/dev/null 2>&1 | ||
| 37 | + else | ||
| 38 | + # "new style" HCDs ... more common code | ||
| 39 | + modprobe -q ehci-hcd >/dev/null 2>&1 | ||
| 40 | + modprobe -q ohci-hcd >/dev/null 2>&1 | ||
| 41 | + modprobe -q uhci-hcd >/dev/null 2>&1 | ||
| 42 | + | ||
| 43 | + # "old style" HCDs ... more driver-specific bugs | ||
| 44 | + modprobe -q usb-ohci >/dev/null 2>&1 | ||
| 45 | + # NOTE: this prefers "uhci"; you may prefer "usb-uhci". | ||
| 46 | + # modprobe -q usb-uhci >/dev/null 2>&1 || modprobe -q uhci >/dev/null 2>&1 | ||
| 47 | + modprobe -q uhci >/dev/null 2>&1 || modprobe -q usb-uhci >/dev/null 2>&1 | ||
| 48 | + | ||
| 49 | + # ... add any non-PCI HCDS here. Examples include the | ||
| 50 | + # CRIS usb-host, Philips ISP-1161, Symlogic 811HS, and so on. | ||
| 51 | + # ohci-hcd can handle some non-pci variants. | ||
| 52 | + fi | ||
| 53 | |||
| 54 | if [ -d /proc/bus/usb ]; then | ||
| 55 | # If we see there are no busses, we "failed" and | ||
