Patchwork tcf-agent: Use kill instead of killproc to stop agent

login
register
mail settings
Submitter Bogdan Marinescu
Date April 8, 2013, 11:58 a.m.
Message ID <1365422283-27630-1-git-send-email-bogdan.a.marinescu@intel.com>
Download mbox | patch
Permalink /patch/47609/
State Accepted
Commit 251361eb78176a04e3da00e0f77b7f3ff459d571
Headers show

Comments

Bogdan Marinescu - April 8, 2013, 11:58 a.m.
From: Ioana Grigoropol <ioanax.grigoropol@intel.com>

[Yocto #3928]

Signed-off-by: Ioana Grigoropol <ioanax.grigoropol@intel.com>
Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@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(-)
Richard Purdie - April 8, 2013, 12:16 p.m.
On Mon, 2013-04-08 at 14:58 +0300, Bogdan Marinescu wrote:
> From: Ioana Grigoropol <ioanax.grigoropol@intel.com>

Why?

> [Yocto #3928]

I could read this but I shouldn't have to...

Cheers,

Richard

> Signed-off-by: Ioana Grigoropol <ioanax.grigoropol@intel.com>
> Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@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 \
Bogdan Marinescu - April 8, 2013, 12:51 p.m.
On Mon, Apr 8, 2013 at 3:16 PM, Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> On Mon, 2013-04-08 at 14:58 +0300, Bogdan Marinescu wrote:
> > From: Ioana Grigoropol <ioanax.grigoropol@intel.com>
>
> Why?
>

Because she is the author of the patch, I've just added a "signed-off-by"
line.

>
> > [Yocto #3928]
>
> I could read this but I shouldn't have to...
>

I've sent the second version of the patch to address this issue.

Thanks,
Bogdan


>
> Cheers,
>
> Richard
>
> > Signed-off-by: Ioana Grigoropol <ioanax.grigoropol@intel.com>
> > Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@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.bbb/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 \
>
>
>

Patch

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 \