From 322393c27f305b41f1911e64158676a9468de828 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 16 Jun 2008 11:07:51 +0000 Subject: linux-hotplug: Drop, we don't support 2.4 kernels git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4670 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../linux-hotplug-20040920/dash.patch | 17 ------- .../linux-hotplug-20040920/fix-net.agent | 29 ------------ .../hotplug-net-agent-usb.patch | 43 ----------------- .../linux-hotplug-20040920/isapnp-exit.diff | 11 ----- .../linux-hotplug-20040920/logcheck-ignore | 1 - .../linux-hotplug-20040920/update-usb.usermap | 37 --------------- .../linux-hotplug-20040920/usb-storage | 2 - .../linux-hotplug-20040920/usbrc-busybox.patch | 13 ----- .../linux-hotplug-20040920/userspecified_hcd.patch | 55 ---------------------- 9 files changed, 208 deletions(-) delete mode 100644 meta/packages/linux-hotplug/linux-hotplug-20040920/dash.patch delete mode 100644 meta/packages/linux-hotplug/linux-hotplug-20040920/fix-net.agent delete mode 100644 meta/packages/linux-hotplug/linux-hotplug-20040920/hotplug-net-agent-usb.patch delete mode 100644 meta/packages/linux-hotplug/linux-hotplug-20040920/isapnp-exit.diff delete mode 100644 meta/packages/linux-hotplug/linux-hotplug-20040920/logcheck-ignore delete mode 100755 meta/packages/linux-hotplug/linux-hotplug-20040920/update-usb.usermap delete mode 100644 meta/packages/linux-hotplug/linux-hotplug-20040920/usb-storage delete mode 100644 meta/packages/linux-hotplug/linux-hotplug-20040920/usbrc-busybox.patch delete mode 100644 meta/packages/linux-hotplug/linux-hotplug-20040920/userspecified_hcd.patch (limited to 'meta/packages/linux-hotplug/linux-hotplug-20040920') 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 161671f2e..000000000 --- a/meta/packages/linux-hotplug/linux-hotplug-20040920/dash.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: hotplug-2004_09_20/Makefile -=================================================================== ---- hotplug-2004_09_20.orig/Makefile 2006-11-29 17:01:16.000000000 +0100 -+++ hotplug-2004_09_20/Makefile 2006-11-29 17:04:39.000000000 +0100 -@@ -86,10 +86,10 @@ - ${INSTALL_SCRIPT} -D sbin/hotplug $(sbindir)/hotplug - $(INSTALL) -d $(etcdir)/hotplug/{usb,pci} - $(INSTALL) -D etc/hotplug.d/default/default.hotplug $(etcdir)/hotplug.d/default/default.hotplug -- for F in etc/hotplug/{*.{agent,rc},hotplug.functions} ; do \ -+ for F in etc/hotplug/*.agent etc/hotplug/*.rc etc/hotplug/hotplug.functions ; do \ - ${INSTALL_SCRIPT} $$F $(etcdir)/hotplug ; \ - done -- for F in etc/hotplug/{blacklist,usb.{user,hand,dist}map} ; do \ -+ for F in etc/hotplug/blacklist etc/hotplug/usb.*map ; do \ - ${INSTALL_DATA} $$F $(etcdir)/hotplug ; \ - done - ${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 3bc093501..000000000 --- a/meta/packages/linux-hotplug/linux-hotplug-20040920/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/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 a64fc50d2..000000000 --- a/meta/packages/linux-hotplug/linux-hotplug-20040920/hotplug-net-agent-usb.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- 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/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 e5a9ab10a..000000000 --- a/meta/packages/linux-hotplug/linux-hotplug-20040920/isapnp-exit.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/meta/packages/linux-hotplug/linux-hotplug-20040920/logcheck-ignore b/meta/packages/linux-hotplug/linux-hotplug-20040920/logcheck-ignore deleted file mode 100644 index b94135304..000000000 --- a/meta/packages/linux-hotplug/linux-hotplug-20040920/logcheck-ignore +++ /dev/null @@ -1 +0,0 @@ -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 d09e1176e..000000000 --- a/meta/packages/linux-hotplug/linux-hotplug-20040920/update-usb.usermap +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -e -# update-usb.usermap -# Copyright (c) 2001 Fumitoshi UKAI -# 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/meta/packages/linux-hotplug/linux-hotplug-20040920/usb-storage b/meta/packages/linux-hotplug/linux-hotplug-20040920/usb-storage deleted file mode 100644 index 138790a36..000000000 --- a/meta/packages/linux-hotplug/linux-hotplug-20040920/usb-storage +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -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 35f43dc52..000000000 --- a/meta/packages/linux-hotplug/linux-hotplug-20040920/usbrc-busybox.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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/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 c2ceeb686..000000000 --- a/meta/packages/linux-hotplug/linux-hotplug-20040920/userspecified_hcd.patch +++ /dev/null @@ -1,55 +0,0 @@ - -# -# 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 -- cgit v1.2.3