aboutsummaryrefslogtreecommitdiffstats
path: root/udev
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-11-17 20:15:52 +0000
committerChris Larson <clarson@kergoth.com>2004-11-17 20:15:52 +0000
commit3a7fa86414e4199a411d4ac92ba7df4b201304f4 (patch)
treea1a746bea0d1df8a379c7ce28c8d2799028ba22e /udev
parent8470d4cbf86191a53927a2de6eeb313b52752770 (diff)
downloadopenembedded-3a7fa86414e4199a411d4ac92ba7df4b201304f4.tar.gz
Merge nslu2-linux@nslu2-linux.bkbits.net:packages
into hyperion.kergoth.com:/home/kergoth/code/packages 2004/11/17 20:31:25+01:00 uni-frankfurt.de!mickeyl fix iqnotes SRC_URI. i mirrored it since upstream seems gone for good 2004/11/17 20:26:55+01:00 uni-frankfurt.de!mickeyl Merge bk://openembedded@openembedded.bkbits.net/packages-devel into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2004/11/17 20:26:38+01:00 uni-frankfurt.de!mickeyl we need opie-packagemanager-cvs for 3.5.2 2004/11/17 20:26:06+01:00 hrw.one.pl!hrw Merge bk://openembedded@openembedded.bkbits.net/packages-devel into home.hrw.one.pl:/home/hrw/zaurus/oe/packages 2004/11/17 20:24:23+01:00 hrw.one.pl!hrw Merge bk://openembedded@openembedded.bkbits.net/packages-devel into home.hrw.one.pl:/home/hrw/zaurus/oe/packages 2004/11/17 20:24:08+01:00 hrw.one.pl!hrw added some packages to meta-opie 2004/11/17 20:24:07+01:00 uni-frankfurt.de!mickeyl opie-collections.inc: remove irda-utils, which is already in handhelds-common 2004/11/17 20:20:57+01:00 uni-frankfurt.de!mickeyl Merge bk://openembedded@openembedded.bkbits.net/packages-devel into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2004/11/17 20:20:47+01:00 uni-frankfurt.de!mickeyl add openobex-apps and irda-utils to opie base 2004/11/17 20:20:30+01:00 uni-frankfurt.de!mickeyl fix sound module deps for collie 2004/11/17 20:03:37+01:00 hrw.one.pl!hrw Merge bk://openembedded@openembedded.bkbits.net/packages-devel into home.hrw.one.pl:/home/hrw/zaurus/oe/packages 2004/11/17 19:54:34+01:00 hrw.one.pl!hrw added qpe-vexed 1.3 2004/11/17 12:44:23-06:00 (none)!kergoth Change the default udevdir to /dev, and kill the long form commandline arguments on the start-stop-daemon calls in udev's startup script. 2004/11/17 17:18:33+01:00 local!hrw Unbork a few of the glibc PROVIDES bits in glibc 2.3.2 20040726 snapshot BKrev: 419bb178SWxMJEIF1b5Fr6nkZDZpXg
Diffstat (limited to 'udev')
-rw-r--r--udev/udev-042/init6
-rw-r--r--udev/udev_042.oe4
2 files changed, 5 insertions, 5 deletions
diff --git a/udev/udev-042/init b/udev/udev-042/init
index 4e31881274..e6b2986f89 100644
--- a/udev/udev-042/init
+++ b/udev/udev-042/init
@@ -99,7 +99,7 @@ case "$1" in
echo "done."
;;
stop)
- start-stop-daemon --stop --exec /sbin/udevd --oknodo --quiet
+ start-stop-daemon -K -x /sbin/udevd
echo -n "Unmounting $udev_root..."
# unmounting with -l should never fail
if umount -l $udev_root; then
@@ -146,7 +146,7 @@ case "$1" in
# /etc/init.d/mountvirtfs start
;;
stop)
- start-stop-daemon --stop --exec /sbin/udevd --oknodo --quiet
+ start-stop-daemon -K -x /sbin/udevd
unmount_devpts
echo -n "Unmounting /dev..."
# unmounting with -l should never fail
@@ -159,7 +159,7 @@ case "$1" in
fi
;;
restart|force-reload)
- start-stop-daemon --stop --exec /sbin/udevd --oknodo --quiet
+ start-stop-daemon -K -x /sbin/udevd
echo -n "Recreating device nodes..."
ACTION=add
$UDEVSTART
diff --git a/udev/udev_042.oe b/udev/udev_042.oe
index 01209744d3..79ea9d5674 100644
--- a/udev/udev_042.oe
+++ b/udev/udev_042.oe
@@ -1,7 +1,7 @@
DESCRIPTION = "udev is a program which dynamically creates and removes device nodes from \
/dev/. It responds to /sbin/hotplug device events and requires a 2.6 kernel."
LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
file://flags.patch;patch=1 \
@@ -15,7 +15,7 @@ INITSCRIPT_NAME = "udev"
INITSCRIPT_PARAMS = "start 03 S ."
export HOSTCC = "${BUILD_CC}"
-export udevdir ?= "/udev"
+export udevdir ?= "/dev"
export usrbindir := "${bindir}"
export usrsbindir := "${sbindir}"
export etcdir = "${sysconfdir}"