32 files changed, 34 insertions, 118 deletions
diff --git a/packages/hotplug/files/collie/usbd b/packages/hotplug-ng/files/flags.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/hotplug/files/collie/usbd
+++ b/packages/hotplug-ng/files/flags.patch
diff --git a/packages/hotplug/files/mmc.agent b/packages/hotplug-ng/hotplug-ng_001.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/hotplug/files/mmc.agent
+++ b/packages/hotplug-ng/hotplug-ng_001.bb
diff --git a/packages/hotplug/hotplug-20040920/hotplug-net-agent-usb.patch b/packages/hotplug/hotplug-20040920/hotplug-net-agent-usb.patch
deleted file mode 100644
index a64fc50d2b..0000000000
--- a/packages/hotplug/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/packages/hotplug/hotplug_20040920.bb b/packages/hotplug/hotplug_20040920.bb
deleted file mode 100644
index 5b796dc27c..0000000000
--- a/packages/hotplug/hotplug_20040920.bb
+++ /dev/null
@@ -1,65 +0,0 @@
-DESCRIPTION = "This package contains the scripts necessary \
-for hotplug Linux support, and lets you plug in new devices \
-and use them immediately."
-HOMEPAGE = "http://linux-hotplug.sourceforge.net/"
-LICENSE = "GPL"
-SECTION = "base"
-PR = "r8"
-RSUGGESTS = "pciutils usbutils"
-
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_09_20.tar.gz \
-	   file://userspecified_hcd.patch;patch=1 \
-	   file://hotplug-net-agent-usb.patch;patch=1 \
-           file://fix-net.agent \
-           file://update-usb.usermap \
-           file://logcheck-ignore \
-	   file://sleeve.agent \
-	   file://sleeve.rc \
-	   file://mmc.agent \
-	   file://usbd.agent \
-	   file://usbd \
-	   file://sysconfig-hotplug \
-	   file://sysconfig-usb \
-	   file://isapnp-exit.diff;patch=1 \
-	   file://usb-storage"
-	   
-S = "${WORKDIR}/hotplug-2004_09_20"
-
-INITSCRIPT_NAME = "hotplug"
-INITSCRIPT_PARAMS = "start 40 S . stop 89 0 6 ."
-
-inherit update-rc.d
-
-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
-	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
-	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
-	install -m 0755 ${WORKDIR}/sleeve.agent ${D}${sysconfdir}/hotplug/
-	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
-	install -d ${D}${sysconfdir}/sysconfig
-	install -m 0644 ${WORKDIR}/sysconfig-hotplug ${D}${sysconfdir}/sysconfig/hotplug
-	install -m 0644 ${WORKDIR}/sysconfig-usb ${D}/${sysconfdir}/sysconfig/usb
-	install -m 0755 ${WORKDIR}/usb-storage ${D}${sysconfdir}/hotplug/usb
-}
diff --git a/packages/hotplug/files/usbd b/packages/linux-hotplug/files/collie/usbd
index e69de29bb2..e69de29bb2 100644
--- a/packages/hotplug/files/usbd
+++ b/packages/linux-hotplug/files/collie/usbd
diff --git a/packages/hotplug/files/sleeve.agent b/packages/linux-hotplug/files/mmc.agent
index e69de29bb2..e69de29bb2 100644
--- a/packages/hotplug/files/sleeve.agent
+++ b/packages/linux-hotplug/files/mmc.agent
diff --git a/packages/hotplug/files/sleeve.rc b/packages/linux-hotplug/files/sleeve.agent
index e69de29bb2..e69de29bb2 100644
--- a/packages/hotplug/files/sleeve.rc
+++ b/packages/linux-hotplug/files/sleeve.agent
diff --git a/packages/hotplug/files/sysconfig-hotplug b/packages/linux-hotplug/files/sleeve.rc
index e69de29bb2..e69de29bb2 100644
--- a/packages/hotplug/files/sysconfig-hotplug
+++ b/packages/linux-hotplug/files/sleeve.rc
diff --git a/packages/hotplug/files/sysconfig-usb b/packages/linux-hotplug/files/sysconfig-hotplug
index e69de29bb2..e69de29bb2 100644
--- a/packages/hotplug/files/sysconfig-usb
+++ b/packages/linux-hotplug/files/sysconfig-hotplug
diff --git a/packages/hotplug/files/tosa/sysconfig-usb b/packages/linux-hotplug/files/sysconfig-usb
index e69de29bb2..e69de29bb2 100644
--- a/packages/hotplug/files/tosa/sysconfig-usb
+++ b/packages/linux-hotplug/files/sysconfig-usb
diff --git a/packages/hotplug/files/usbd.agent b/packages/linux-hotplug/files/tosa/sysconfig-usb
index e69de29bb2..e69de29bb2 100644
--- a/packages/hotplug/files/usbd.agent
+++ b/packages/linux-hotplug/files/tosa/sysconfig-usb
diff --git a/packages/hotplug/hotplug-20040329/busybox.patch b/packages/linux-hotplug/files/usbd
index e69de29bb2..e69de29bb2 100644
--- a/packages/hotplug/hotplug-20040329/busybox.patch
+++ b/packages/linux-hotplug/files/usbd
diff --git a/packages/hotplug/hotplug-20040329/fix-net.agent b/packages/linux-hotplug/files/usbd.agent
index e69de29bb2..e69de29bb2 100644
--- a/packages/hotplug/hotplug-20040329/fix-net.agent
+++ b/packages/linux-hotplug/files/usbd.agent
diff --git a/packages/hotplug/hotplug-20040329/logcheck-ignore b/packages/linux-hotplug/linux-hotplug-20040329/busybox.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/hotplug/hotplug-20040329/logcheck-ignore
+++ b/packages/linux-hotplug/linux-hotplug-20040329/busybox.patch
diff --git a/packages/hotplug/hotplug-20040920/fix-net.agent b/packages/linux-hotplug/linux-hotplug-20040329/fix-net.agent
index e69de29bb2..e69de29bb2 100644
--- a/packages/hotplug/hotplug-20040920/fix-net.agent
+++ b/packages/linux-hotplug/linux-hotplug-20040329/fix-net.agent
diff --git a/packages/hotplug/hotplug-20040920/logcheck-ignore b/packages/linux-hotplug/linux-hotplug-20040329/logcheck-ignore
index e69de29bb2..e69de29bb2 100644
--- a/packages/hotplug/hotplug-20040920/logcheck-ignore
+++ b/packages/linux-hotplug/linux-hotplug-20040329/logcheck-ignore
diff --git a/packages/hotplug/hotplug-20040329/update-usb.usermap b/packages/linux-hotplug/linux-hotplug-20040329/update-usb.usermap
index e69de29bb2..e69de29bb2 100644
--- a/packages/hotplug/hotplug-20040329/update-usb.usermap
+++ b/packages/linux-hotplug/linux-hotplug-20040329/update-usb.usermap
diff --git a/packages/hotplug/hotplug-20040920/isapnp-exit.diff b/packages/linux-hotplug/linux-hotplug-20040920/fix-net.agent
index e69de29bb2..e69de29bb2 100644
--- a/packages/hotplug/hotplug-20040920/isapnp-exit.diff
+++ b/packages/linux-hotplug/linux-hotplug-20040920/fix-net.agent
diff --git a/packages/hotplug/hotplug-20040920/update-usb.usermap b/packages/linux-hotplug/linux-hotplug-20040920/hotplug-net-agent-usb.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/hotplug/hotplug-20040920/update-usb.usermap
+++ b/packages/linux-hotplug/linux-hotplug-20040920/hotplug-net-agent-usb.patch
diff --git a/packages/hotplug/hotplug-20040920/usb-storage b/packages/linux-hotplug/linux-hotplug-20040920/isapnp-exit.diff
index e69de29bb2..e69de29bb2 100644
--- a/packages/hotplug/hotplug-20040920/usb-storage
+++ b/packages/linux-hotplug/linux-hotplug-20040920/isapnp-exit.diff
diff --git a/packages/hotplug/hotplug-20040920/userspecified_hcd.patch b/packages/linux-hotplug/linux-hotplug-20040920/logcheck-ignore
index e69de29bb2..e69de29bb2 100644
--- a/packages/hotplug/hotplug-20040920/userspecified_hcd.patch
+++ b/packages/linux-hotplug/linux-hotplug-20040920/logcheck-ignore
diff --git a/packages/hotplug/hotplug_20040329.bb b/packages/linux-hotplug/linux-hotplug-20040920/update-usb.usermap
index e69de29bb2..e69de29bb2 100644
--- a/packages/hotplug/hotplug_20040329.bb
+++ b/packages/linux-hotplug/linux-hotplug-20040920/update-usb.usermap
diff --git a/packages/linux-hotplug/linux-hotplug-20040920/usb-storage b/packages/linux-hotplug/linux-hotplug-20040920/usb-storage
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux-hotplug/linux-hotplug-20040920/usb-storage
diff --git a/packages/linux-hotplug/linux-hotplug-20040920/userspecified_hcd.patch b/packages/linux-hotplug/linux-hotplug-20040920/userspecified_hcd.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux-hotplug/linux-hotplug-20040920/userspecified_hcd.patch
diff --git a/packages/linux-hotplug/linux-hotplug_20040329.bb b/packages/linux-hotplug/linux-hotplug_20040329.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux-hotplug/linux-hotplug_20040329.bb
diff --git a/packages/linux-hotplug/linux-hotplug_20040920.bb b/packages/linux-hotplug/linux-hotplug_20040920.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux-hotplug/linux-hotplug_20040920.bb
diff --git a/packages/linux/linux-colinux_2.6.10.bb b/packages/linux/linux-colinux_2.6.10.bb
index e69de29bb2..ecd0f64a0d 100644
--- a/packages/linux/linux-colinux_2.6.10.bb
+++ b/packages/linux/linux-colinux_2.6.10.bb
@@ -0,0 +1,23 @@
+SECTION = "kernel"
+DESCRIPTION = "User Mode Linux Kernel"
+LICENSE = "GPL"
+COLV = "0.6.2"
+
+#http://internap.dl.sourceforge.net/sourceforge/colinux/coLinux-${COLV}.tar.gz
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
+	   file://colinux-${COLV}.patch;patch=1 \
+	   file://defconfig"
+
+S = "${WORKDIR}/linux-${PV}"
+
+inherit kernel
+
+COMPATIBLE_HOST = "i.86.*-linux"
+KERNEL_IMAGETYPE = "vmlinux"
+KERNEL_OUTPUT = "./${KERNEL_IMAGETYPE}"
+
+do_configure() {
+	echo '-co-${COLV}' > localversion-cooperative
+	install -m 0644 ${WORKDIR}/defconfig .config
+	kernel_do_configure
+}
diff --git a/packages/meta/nylon-feed.bb b/packages/meta/nylon-feed.bb
index a1cb515b8e..f5b803f58e 100644
--- a/packages/meta/nylon-feed.bb
+++ b/packages/meta/nylon-feed.bb
@@ -19,7 +19,7 @@ gnupg \
 hostap-modules \
 hostap-utils \
 hostap-daemon \
-hotplug \
+linux-hotplug \
 htb-init \
 ifplugd \
 initscripts \
diff --git a/packages/meta/nylon-image-standard.bb b/packages/meta/nylon-image-standard.bb
index b6b18d18b4..2542e16f7a 100644
--- a/packages/meta/nylon-image-standard.bb
+++ b/packages/meta/nylon-image-standard.bb
@@ -6,7 +6,7 @@ NYLON_STANDARD = "\
 	bridge-utils \
 	dnsmasq \
 	hostap-utils \
-	hotplug \
+	linux-hotplug \
 	ifplugd iproute2 iptables \
 	mobilemesh \
 	nylon-scripts \
diff --git a/packages/meta/openslug-image.bb b/packages/meta/openslug-image.bb
index 561bef4665..3324f20574 100644
--- a/packages/meta/openslug-image.bb
+++ b/packages/meta/openslug-image.bb
@@ -1,4 +1,4 @@
-PR = "r2"
+PR = "r3"
 
 IMAGE_BASENAME = "openslug"
 
@@ -9,14 +9,14 @@ OPENSLUG_HIDDEN_PACKAGES = "ipkg-native ipkg-utils-native fakeroot-native ${PATC
 	virtual/libc makedevs-native mtd-utils-native slugimage-native nslu2-linksys-firmware nslu2-switchbox-firmware "
 
 DEPENDS = "base-files base-passwd-3.5.7 \
-        busybox dropbear hotplug initscripts netbase \
+        busybox dropbear initscripts netbase \
         sysvinit tinylogin lrzsz portmap \
         ixp4xx-csr ixp425-eth openslug-init \
         ipkg-collateral ipkg ipkg-link \
         ${OPENSLUG_EXTRA_DEPENDS}"
 
 IPKG_INSTALL = "base-files base-passwd \
-        busybox dropbear hotplug initscripts netbase \
+        busybox dropbear initscripts netbase \
         update-modules sysvinit tinylogin lrzsz portmap \
         ixp4xx-csr ixp425-eth  openslug-init \
         ipkg-collateral ipkg ipkg-link \
diff --git a/packages/meta/task-bootstrap-unionroot.bb b/packages/meta/task-bootstrap-unionroot.bb
index 2e2108d08c..2226d8251c 100644
--- a/packages/meta/task-bootstrap-unionroot.bb
+++ b/packages/meta/task-bootstrap-unionroot.bb
@@ -3,6 +3,7 @@ MAINTAINER = "Chris Lord <cwiiis@handhelds.org>"
 PROVIDES = "task-bootstrap"
 PN = "task-bootstrap"
 PV = "1.0unionroot"
+PR = "r1"
 DEFAULT_PREFERENCE = "-1"
 
 # The BOOTSTRAP_EXTRA_ variables are often manipulated by the
@@ -35,7 +36,7 @@ def bootstrap_modutils_rdepends(d):
         return ' '.join(r)
 
 DEPENDS = 'base-files base-passwd-3.5.7 \
-	busybox dropbear hotplug initscripts modutils netbase \
+	busybox dropbear initscripts modutils netbase \
 	sysvinit tinylogin portmap \
 	modutils-initscripts \
 	${BOOTSTRAP_EXTRA_DEPENDS} \
@@ -46,7 +47,7 @@ DEPENDS = 'base-files base-passwd-3.5.7 \
 	unionroot-utils'
 
 RDEPENDS = 'base-files base-passwd busybox \
-	hotplug initscripts \
+	initscripts \
 	netbase sysvinit sysvinit-pidof tinylogin \
 	modutils-initscripts \
 	${BOOTSTRAP_EXTRA_RDEPENDS} \
diff --git a/packages/meta/task-bootstrap.bb b/packages/meta/task-bootstrap.bb
index 811fa8cbf3..87f23f39fb 100644
--- a/packages/meta/task-bootstrap.bb
+++ b/packages/meta/task-bootstrap.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Core packages required for a basic installation"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR = "r19"
+PR = "r20"
 
 # The BOOTSTRAP_EXTRA_ variables are often manipulated by the
 # MACHINE .conf files, so adjust PACKAGE_ARCH accordingly.
@@ -32,14 +32,14 @@ def bootstrap_modutils_rdepends(d):
         return ' '.join(r)
 
 DEPENDS = 'base-files base-passwd-3.5.7 \
-	busybox dropbear hotplug initscripts modutils netbase \
+	busybox dropbear initscripts modutils netbase \
 	sysvinit tinylogin portmap \
 	modutils-initscripts \
 	${BOOTSTRAP_EXTRA_DEPENDS} \
 	${@bootstrap_modutils_depends(d)}'
 
 RDEPENDS = 'base-files base-passwd busybox \
-	hotplug initscripts \
+	initscripts \
 	netbase sysvinit sysvinit-pidof tinylogin \
 	modutils-initscripts \
 	${BOOTSTRAP_EXTRA_RDEPENDS} \