Merge oe-devel@oe-devel.bkbits.net:openembedded

into hyperion.kergoth.com:/home/kergoth/code/openembedded

2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.

BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA

4 files changed, 0 insertions, 122 deletions

diff --git a/hotplug/hotplug-20040920/fix-net.agent b/hotplug/hotplug-20040920/fix-net.agent
deleted file mode 100644
index 3bc0935018..0000000000
--- a/hotplug/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/hotplug/hotplug-20040920/logcheck-ignore b/hotplug/hotplug-20040920/logcheck-ignore
deleted file mode 100644
index b941353041..0000000000
--- a/hotplug/hotplug-20040920/logcheck-ignore
+++ /dev/null
@@ -1 +0,0 @@
-net.agent: invoke if(up|down)
diff --git a/hotplug/hotplug-20040920/update-usb.usermap b/hotplug/hotplug-20040920/update-usb.usermap
deleted file mode 100644
index d09e1176ec..0000000000
--- a/hotplug/hotplug-20040920/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-20040920/userspecified_hcd.patch b/hotplug/hotplug-20040920/userspecified_hcd.patch
deleted file mode 100644
index c2ceeb686e..0000000000
--- a/hotplug/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