summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-11-19 17:10:29 +0000
committerRoss Burton <ross@openedhand.com>2007-11-19 17:10:29 +0000
commit1cffb7140be38f3ef07eabebd46888e0191edbc7 (patch)
tree0d1bbf94064a17cb24b7ce7b804480a4ac35edaa
parentad0051ab5b43feed75f6d77b827d5d27d0e469d3 (diff)
downloadpoky-1cffb7140be38f3ef07eabebd46888e0191edbc7.tar.gz
hal: don't pass --oknodo to start-stop-daemon, busybox doesn't support it
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3197 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rwxr-xr-xmeta/packages/hal/files/20hal2
-rw-r--r--meta/packages/hal/hal_0.5.9.1.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/packages/hal/files/20hal b/meta/packages/hal/files/20hal
index ff6ffc2b4c..5b97c4f9e6 100755
--- a/meta/packages/hal/files/20hal
+++ b/meta/packages/hal/files/20hal
@@ -33,7 +33,7 @@ do_start() {
33 33
34do_stop() { 34do_stop() {
35 echo "Stopping $DESC" "$NAME" 35 echo "Stopping $DESC" "$NAME"
36 start-stop-daemon --stop --oknodo --quiet --pidfile $PIDFILE \ 36 start-stop-daemon --stop --quiet --pidfile $PIDFILE \
37 --exec $DAEMON 37 --exec $DAEMON
38} 38}
39 39
diff --git a/meta/packages/hal/hal_0.5.9.1.bb b/meta/packages/hal/hal_0.5.9.1.bb
index 6c7bcebd3f..9cfc28a03d 100644
--- a/meta/packages/hal/hal_0.5.9.1.bb
+++ b/meta/packages/hal/hal_0.5.9.1.bb
@@ -7,7 +7,7 @@ DEPENDS = "virtual/kernel dbus-glib udev intltool-native expat libusb"
7RDEPENDS_${PN} += "udev hal-info" 7RDEPENDS_${PN} += "udev hal-info"
8RRECOMMENDS_${PN} += "udev-utils" 8RRECOMMENDS_${PN} += "udev-utils"
9 9
10PR = "r3" 10PR = "r4"
11 11
12SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz \ 12SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz \
13 file://sg-inhibit.patch;patch=1 \ 13 file://sg-inhibit.patch;patch=1 \