aboutsummaryrefslogtreecommitdiffstats
path: root/packages/linux-hotplug/linux-hotplug_20040920.bb
diff options
context:
space:
mode:
authorJohn Bowler <jbowler@nslu2-linux.org>2005-05-25 17:14:37 +0000
committerJohn Bowler <jbowler@nslu2-linux.org>2005-05-25 17:14:37 +0000
commitab67512dd0019cd2d0f1beb718de0fe255037509 (patch)
tree35cffb92c34aef7e3436c94955bfa21b7e702e78 /packages/linux-hotplug/linux-hotplug_20040920.bb
parentb59f7b5c9da751e5ef22f523565239cd75d76f74 (diff)
downloadopenembedded-ab67512dd0019cd2d0f1beb718de0fe255037509.tar.gz
openembedded-ab67512dd0019cd2d0f1beb718de0fe255037509.tar.bz2
openembedded-ab67512dd0019cd2d0f1beb718de0fe255037509.zip
Merge with OE (there may still be a bug in the busybox postinst script)
2005/05/25 16:24:12+01:00 reciva.com!pb patch usb.rc to work with busybox (no "grep -o") 2005/05/25 13:09:04+01:00 reciva.com!pb Merge bk://oe-devel@openembedded-devel.bkbits.net/openembedded into mill.internal.reciva.com:/nexus/home/pb/oe/oe 2005/05/25 13:05:58+01:00 reciva.com!pb apply patch to udhcpc to send the current hostname if no -H option is given 2005/05/25 12:54:31+02:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/05/25 12:54:19+02:00 uni-frankfurt.de!mickeyl fix yacc in bison-native 2005/05/25 11:48:52+01:00 reciva.com!pb turn on support for "readlink -f", needed by usbutils 2005/05/25 11:40:50+01:00 reciva.com!pb Merge bk://oe-devel@openembedded-devel.bkbits.net/openembedded into mill.internal.reciva.com:/nexus/home/pb/oe/oe 2005/05/25 11:37:22+01:00 reciva.com!pb don't require /etc/httpd.conf to start busybox httpd, it works fine without that file 2005/05/25 12:29:58+02:00 handhelds.org!CoreDump Add altboot: A text based 'boot manager' (/sbin/init hack) to allow booting from SD and CF, boot a recovery shell (init=/bin/sh) or boot into a GUI-less runlevel 2005/05/25 11:24:50+01:00 reciva.com!pb package busybox udhcpd bits separately; remove stray copy of main postinst in -httpd package. 2005/05/25 11:52:12+02:00 local!hrw Merge bk://oe-devel.bkbits.net/openembedded into marcinj.local:/home/hrw/zaurus/oe/openembedded 2005/05/25 11:51:20+02:00 local!hrw regenerated dejavu fonts 2005/05/25 10:50:32+01:00 reciva.com!pb set default update-rc.d parameters to "defaults" BKrev: 4294b27d6MVA-cFYArKaJud80nBnzA
Diffstat (limited to 'packages/linux-hotplug/linux-hotplug_20040920.bb')
-rw-r--r--packages/linux-hotplug/linux-hotplug_20040920.bb3
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/linux-hotplug/linux-hotplug_20040920.bb b/packages/linux-hotplug/linux-hotplug_20040920.bb
index dca0ba0c1f..9edb548939 100644
--- a/packages/linux-hotplug/linux-hotplug_20040920.bb
+++ b/packages/linux-hotplug/linux-hotplug_20040920.bb
@@ -7,12 +7,13 @@ RPROVIDES = "hotplug"
RCONFLICTS = "hotplug"
RREPLACES = "hotplug"
SECTION = "base"
-PR = "r2"
+PR = "r3"
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://usbrc-busybox.patch;patch=1 \
file://fix-net.agent \
file://update-usb.usermap \
file://logcheck-ignore \