summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2008-06-02 15:11:20 +0000
committerKoen Kooi <koen@openembedded.org>2008-06-02 15:11:20 +0000
commit10284f67bd365ceeed57a8946bf96c95a106e2be (patch)
tree262a339a1c7be08a150b2f695ac30fecc1a306fc
parentab4c379259186eddf278338100eff781518d1cbe (diff)
hal: revert PIDFILE hunk
-rw-r--r--packages/hal/files/20hal2
-rw-r--r--packages/hal/hal_0.5.9.1.bb2
-rw-r--r--packages/hal/hal_0.5.9.bb2
-rw-r--r--packages/hal/hal_git.bb2
4 files changed, 4 insertions, 4 deletions
diff --git a/packages/hal/files/20hal b/packages/hal/files/20hal
index 5b97c4f9e6..926bd893e2 100644
--- a/packages/hal/files/20hal
+++ b/packages/hal/files/20hal
@@ -12,7 +12,7 @@
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
DAEMON=/usr/sbin/hald
PIDDIR=/var/run/hald
-PIDFILE=$PIDDIR/hald.pid
+PIDFILE=$PIDDIR/pid
NAME=hald
DAEMONUSER=haldaemon
DESC="Hardware abstraction layer"
diff --git a/packages/hal/hal_0.5.9.1.bb b/packages/hal/hal_0.5.9.1.bb
index 8e4ad23937..f9dbdc6039 100644
--- a/packages/hal/hal_0.5.9.1.bb
+++ b/packages/hal/hal_0.5.9.1.bb
@@ -7,7 +7,7 @@ DEPENDS = "virtual/kernel dbus-glib udev intltool-native expat libusb"
RDEPENDS_${PN} += "udev hal-info"
RRECOMMENDS_${PN} += "udev-utils"
-PR = "r6"
+PR = "r7"
SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz \
file://configure_fix.patch;patch=1 \
diff --git a/packages/hal/hal_0.5.9.bb b/packages/hal/hal_0.5.9.bb
index d84179eb1e..8015a4ceb5 100644
--- a/packages/hal/hal_0.5.9.bb
+++ b/packages/hal/hal_0.5.9.bb
@@ -5,7 +5,7 @@ RDEPENDS += "udev hal-info"
#RDEPENDS_hal-device-manager = "python hal python-pygnome"
RRECOMMENDS = "udev-utils"
-PR = "r6"
+PR = "r7"
SRC_URI += "file://99_hal \
file://20hal \
diff --git a/packages/hal/hal_git.bb b/packages/hal/hal_git.bb
index 0cdcafd24d..e2e9418810 100644
--- a/packages/hal/hal_git.bb
+++ b/packages/hal/hal_git.bb
@@ -14,7 +14,7 @@ SRC_URI = "git://anongit.freedesktop.org/hal/;protocol=git \
file://99_hal"
PV = "0.5.9.1+git${SRCDATE}"
-PR = "r4"
+PR = "r5"
S = "${WORKDIR}/git"