[oe-commits] Tom Rini : ust.inc: Fix ustd.init for 0.12

[git version control]

Module: openembedded.git
Branch: master
Commit: 2a430776fe79123a35c2a41bfb90237ad1ad170b
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=2a430776fe79123a35c2a41bfb90237ad1ad170b

Author: Tom Rini <tom_rini at mentor.com>
Date:   Tue Jun 14 11:37:39 2011 -0700

ust.inc: Fix ustd.init for 0.12

With 0.12, how ust daemon needs to be started changed, update the initscript
for it.  (While in here, Tom dropped S assignment from ust.inc).

Signed-off-by: Andrew Gabbasov <andrew_gabbasov at mentor.com>
Signed-off-by: Tom Rini <tom_rini at mentor.com>

---

 recipes/lttng/ust.inc       |    4 +---
 recipes/lttng/ust/ustd.init |    4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/recipes/lttng/ust.inc b/recipes/lttng/ust.inc
index 39ef1f5..dd9a743 100644
--- a/recipes/lttng/ust.inc
+++ b/recipes/lttng/ust.inc
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "GPLv2 and LGPLv2.1"
 DEPENDS = "liburcu"
 
-PR = "r4"
+PR = "r5"
 
 inherit update-rc.d
 
@@ -16,8 +16,6 @@ UST_BASEDIR = "/tmp/ust"
 SRC_URI = "http://lttng.org/files/ust/releases/ust-${PV}.tar.gz \
 	file://ustd.init"
 
-S = "${WORKDIR}/ust-${PV}"
-
 inherit autotools
 
 do_compile_append () {
diff --git a/recipes/lttng/ust/ustd.init b/recipes/lttng/ust/ustd.init
index c23372a..5810a82 100644
--- a/recipes/lttng/ust/ustd.init
+++ b/recipes/lttng/ust/ustd.init
@@ -1,13 +1,13 @@
 #!/bin/sh
 
-PIDFILE="/var/run/ustd.pid"
+PIDFILE="/var/run/ust-consumerd.pid"
 TRACEDIR="/tmp/ust"
 
 case "$1" in
 
     start)
 	mkdir -p $TRACEDIR
-	ustd -o $TRACEDIR -d --pidfile $PIDFILE
+	ust-consumerd -o $TRACEDIR -d --pidfile $PIDFILE
 	;;
 
     stop)