From e6679fbc2cad92aca4b73bde2cdb9a82405fd516 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 17 Feb 2005 18:42:39 +0000 Subject: Merge oe-devel@oe-devel.bkbits.net:openembedded into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded 2005/02/17 12:41:30-06:00 ti.com!kergoth Set the kernel version string correctly in the colinux kernel build. 2005/02/17 12:40:42-06:00 ti.com!kergoth Add hotplug-ng, rename hotplug to linux-hotplug, and move the decision about which /sbin/hotplug binary you use into the hands of the distributions. BKrev: 4214e59fRUBz9NJWKrkQdsqK0Ps__A --- packages/hotplug/files/collie/usbd | 0 packages/hotplug/files/mmc.agent | 0 packages/hotplug/files/sleeve.agent | 0 packages/hotplug/files/sleeve.rc | 0 packages/hotplug/files/sysconfig-hotplug | 0 packages/hotplug/files/sysconfig-usb | 0 packages/hotplug/files/tosa/sysconfig-usb | 0 packages/hotplug/files/usbd | 0 packages/hotplug/files/usbd.agent | 0 packages/hotplug/hotplug-20040329/busybox.patch | 0 packages/hotplug/hotplug-20040329/fix-net.agent | 0 packages/hotplug/hotplug-20040329/logcheck-ignore | 0 .../hotplug/hotplug-20040329/update-usb.usermap | 0 packages/hotplug/hotplug-20040920/fix-net.agent | 0 .../hotplug-20040920/hotplug-net-agent-usb.patch | 43 -------------- packages/hotplug/hotplug-20040920/isapnp-exit.diff | 0 packages/hotplug/hotplug-20040920/logcheck-ignore | 0 .../hotplug/hotplug-20040920/update-usb.usermap | 0 packages/hotplug/hotplug-20040920/usb-storage | 0 .../hotplug-20040920/userspecified_hcd.patch | 0 packages/hotplug/hotplug_20040329.bb | 0 packages/hotplug/hotplug_20040920.bb | 65 ---------------------- 22 files changed, 108 deletions(-) delete mode 100644 packages/hotplug/files/collie/usbd delete mode 100644 packages/hotplug/files/mmc.agent delete mode 100644 packages/hotplug/files/sleeve.agent delete mode 100644 packages/hotplug/files/sleeve.rc delete mode 100644 packages/hotplug/files/sysconfig-hotplug delete mode 100644 packages/hotplug/files/sysconfig-usb delete mode 100644 packages/hotplug/files/tosa/sysconfig-usb delete mode 100644 packages/hotplug/files/usbd delete mode 100644 packages/hotplug/files/usbd.agent delete mode 100644 packages/hotplug/hotplug-20040329/busybox.patch delete mode 100644 packages/hotplug/hotplug-20040329/fix-net.agent delete mode 100644 packages/hotplug/hotplug-20040329/logcheck-ignore delete mode 100644 packages/hotplug/hotplug-20040329/update-usb.usermap delete mode 100644 packages/hotplug/hotplug-20040920/fix-net.agent delete mode 100644 packages/hotplug/hotplug-20040920/hotplug-net-agent-usb.patch delete mode 100644 packages/hotplug/hotplug-20040920/isapnp-exit.diff delete mode 100644 packages/hotplug/hotplug-20040920/logcheck-ignore delete mode 100644 packages/hotplug/hotplug-20040920/update-usb.usermap delete mode 100644 packages/hotplug/hotplug-20040920/usb-storage delete mode 100644 packages/hotplug/hotplug-20040920/userspecified_hcd.patch delete mode 100644 packages/hotplug/hotplug_20040329.bb delete mode 100644 packages/hotplug/hotplug_20040920.bb (limited to 'packages/hotplug') diff --git a/packages/hotplug/files/collie/usbd b/packages/hotplug/files/collie/usbd deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/hotplug/files/mmc.agent b/packages/hotplug/files/mmc.agent deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/hotplug/files/sleeve.agent b/packages/hotplug/files/sleeve.agent deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/hotplug/files/sleeve.rc b/packages/hotplug/files/sleeve.rc deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/hotplug/files/sysconfig-hotplug b/packages/hotplug/files/sysconfig-hotplug deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/hotplug/files/sysconfig-usb b/packages/hotplug/files/sysconfig-usb deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/hotplug/files/tosa/sysconfig-usb b/packages/hotplug/files/tosa/sysconfig-usb deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/hotplug/files/usbd b/packages/hotplug/files/usbd deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/hotplug/files/usbd.agent b/packages/hotplug/files/usbd.agent deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/hotplug/hotplug-20040329/busybox.patch b/packages/hotplug/hotplug-20040329/busybox.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/hotplug/hotplug-20040329/fix-net.agent b/packages/hotplug/hotplug-20040329/fix-net.agent deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/hotplug/hotplug-20040329/logcheck-ignore b/packages/hotplug/hotplug-20040329/logcheck-ignore deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/hotplug/hotplug-20040329/update-usb.usermap b/packages/hotplug/hotplug-20040329/update-usb.usermap deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/hotplug/hotplug-20040920/fix-net.agent b/packages/hotplug/hotplug-20040920/fix-net.agent deleted file mode 100644 index e69de29bb2..0000000000 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/isapnp-exit.diff b/packages/hotplug/hotplug-20040920/isapnp-exit.diff deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/hotplug/hotplug-20040920/logcheck-ignore b/packages/hotplug/hotplug-20040920/logcheck-ignore deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/hotplug/hotplug-20040920/update-usb.usermap b/packages/hotplug/hotplug-20040920/update-usb.usermap deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/hotplug/hotplug-20040920/usb-storage b/packages/hotplug/hotplug-20040920/usb-storage deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/hotplug/hotplug-20040920/userspecified_hcd.patch b/packages/hotplug/hotplug-20040920/userspecified_hcd.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/hotplug/hotplug_20040329.bb b/packages/hotplug/hotplug_20040329.bb deleted file mode 100644 index e69de29bb2..0000000000 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 -} -- cgit v1.2.3