[OE-core] [PATCH] tcf-agent: Use kill instead of killproc to stop agent
Richard Purdie
richard.purdie at linuxfoundation.org
Mon Apr 8 12:16:41 UTC 2013
On Mon, 2013-04-08 at 14:58 +0300, Bogdan Marinescu wrote:
> From: Ioana Grigoropol <ioanax.grigoropol at intel.com>
Why?
> [Yocto #3928]
I could read this but I shouldn't have to...
Cheers,
Richard
> Signed-off-by: Ioana Grigoropol <ioanax.grigoropol at intel.com>
> Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu at intel.com>
> ---
> .../tcf-agent/tcf-agent/fix_tcf-agent.init.patch | 6 ++++--
> meta/recipes-devtools/tcf-agent/tcf-agent_git.bb | 2 +-
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent/fix_tcf-agent.init.patch b/meta/recipes-devtools/tcf-agent/tcf-agent/fix_tcf-agent.init.patch
> index fefaf04..8ea5b43 100644
> --- a/meta/recipes-devtools/tcf-agent/tcf-agent/fix_tcf-agent.init.patch
> +++ b/meta/recipes-devtools/tcf-agent/tcf-agent/fix_tcf-agent.init.patch
> @@ -13,7 +13,7 @@ Upstream-Status: Inappropriate [poky-specific script]
> install -c -t $(INSTALLROOT)$(INCLUDE)/tcf/services -m 644 services/*.h
> --- /dev/null
> +++ b/tcf-agent.init
> -@@ -0,0 +1,78 @@
> +@@ -0,0 +1,80 @@
> +#!/bin/sh
> +### BEGIN INIT INFO
> +# Provides: tcf-agent
> @@ -50,14 +50,16 @@ Upstream-Status: Inappropriate [poky-specific script]
> + stop)
> + echo -n "Stopping $DAEMON_NAME: "
> + count=0
> ++ pid=$(/bin/pidof $DAEMON_PATH)
> + while [ -n "`/bin/pidof $DAEMON_PATH`" -a $count -lt 10 ] ; do
> -+ killproc $DAEMON_PATH >& /dev/null
> ++ kill $pid > /dev/null 2>&1
> + sleep 1
> + RETVAL=$?
> + if [ $RETVAL != 0 -o -n "`/bin/pidof $DAEMON_PATH`" ] ; then
> + sleep 3
> + fi
> + count=`expr $count + 1`
> ++ pid=$(/bin/pidof $DAEMON_PATH)
> + done
> + rm -f /var/lock/subsys/$DAEMON_NAME
> + if [ -n "`/bin/pidof $DAEMON_PATH`" ] ; then
> diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
> index 4d43c62..ced2b41 100644
> --- a/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
> +++ b/meta/recipes-devtools/tcf-agent/tcf-agent_git.bb
> @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://edl-v10.html;md5=522a390a83dc186513f0500543ad3679"
>
> SRCREV = "4ef94ecb927a8912c3d79ce137182247786cff8f"
> PV = "0.4.0+git${SRCPV}"
> -PR = "r0"
> +PR = "r1"
>
> SRC_URI = "git://git.eclipse.org/gitroot/tcf/org.eclipse.tcf.agent.git;protocol=git \
> file://fix_ranlib.patch \
More information about the Openembedded-core
mailing list