diff options
Diffstat (limited to 'meta/recipes-devtools/tcf-agent/tcf-agent')
4 files changed, 35 insertions, 25 deletions
diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch b/meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch deleted file mode 100644 index 5d704567c8..0000000000 --- a/meta/recipes-devtools/tcf-agent/tcf-agent/fix_ranlib.patch +++ /dev/null @@ -1,14 +0,0 @@ -Upstream-Status: Inappropriate [poky-specific fix] - ---- a/Makefile.inc -+++ b/Makefile.inc -@@ -57,6 +57,9 @@ - ifeq ($(NO_UUID),) - LIBS += -luuid - endif -+ ifneq ($(RANLIB),) -+ RANLIB += $@ -+ endif - endif - - ifneq ($(OPSYS),Windows) diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent/ldflags.patch b/meta/recipes-devtools/tcf-agent/tcf-agent/ldflags.patch new file mode 100644 index 0000000000..dfe492091c --- /dev/null +++ b/meta/recipes-devtools/tcf-agent/tcf-agent/ldflags.patch @@ -0,0 +1,32 @@ +We need LDFLAGS to be respected otherwise there are QA warnings as the right +flags don't get used. + +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton <ross.burton@arm.com> + +From d92af0483c20365fd0af740d0baef8870b4aa374 Mon Sep 17 00:00:00 2001 +From: Abdur Rehman <abdur_rehman@mentor.com> +Date: Wed, 26 Aug 2015 19:18:11 +0500 +Subject: [PATCH] tcf-agent: obey LDFLAGS + +Signed-off-by: Abdur Rehman <abdur_rehman@mentor.com> +--- + Makefile.inc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.inc b/Makefile.inc +index 959028f..3148942 100644 +--- a/Makefile.inc ++++ b/Makefile.inc +@@ -96,7 +96,7 @@ NO_LINK_F ?= -c + # Linker definition and flags + + LINK ?= $(CC) +-LINK_FLAGS ?= $(CFLAGS) ++LINK_FLAGS ?= $(LDFLAGS) $(CFLAGS) + LINK_OUT_F ?= $(OUT_OBJ_F) + + # Archiver definition and flags +-- +1.7.9.5 + diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.init b/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.init index 6303280aae..f90208555b 100755 --- a/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.init +++ b/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.init @@ -33,16 +33,7 @@ case "$1" in stop) echo -n "Stopping $DAEMON_NAME: " - count=0 - while [ -n "`/bin/pidof $DAEMON_PATH`" -a $count -lt 10 ] ; do - killproc $DAEMON_PATH >& /dev/null - sleep 1 - RETVAL=$? - if [ $RETVAL != 0 -o -n "`/bin/pidof $DAEMON_PATH`" ] ; then - sleep 3 - fi - count=`expr $count + 1` - done + start-stop-daemon -K -q -x $DAEMON_PATH -s USR2 rm -f /var/lock/subsys/$DAEMON_NAME if [ -n "`/bin/pidof $DAEMON_PATH`" ] ; then echo "FAIL" @@ -72,4 +63,3 @@ case "$1" in esac exit $RETVAL - diff --git a/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.service b/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.service index fd9a6c4d56..a486ac7bad 100644 --- a/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.service +++ b/meta/recipes-devtools/tcf-agent/tcf-agent/tcf-agent.service @@ -5,6 +5,8 @@ After=network.target [Service] Type=forking ExecStart=@SBINDIR@/tcf-agent -d -L- -l0 +KillSignal=USR2 +SuccessExitStatus=USR2 [Install] WantedBy=multi-user.target |