summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-09-05 15:29:32 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-08 00:33:47 +0100
commitb22a505414db060b5df0ce3d6c84c5dffd38463e (patch)
tree301f009a0fc56420c08ed74be1aaa5eeab5aa0f9 /bitbake
parentd2e7ed0c88971070bd0d91916ff636f724263b8a (diff)
downloadpoky-b22a505414db060b5df0ce3d6c84c5dffd38463e.tar.gz
bitbake: toaster: don't kill all runserver processes
Toaster script kills runserver process 2 ways: - sending signal to pid from .toastermain.pid. - sending signal to pids found by grepping ps output: ps fux | grep "python.*manage.py runserver" Second approach is redundant and harmfull as it kills all django development server running on the machine. [YOCTO #7973] (Bitbake rev: 0f47b17fe88dc660648d94b2d8d8286d87ae6295) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rwxr-xr-xbitbake/bin/toaster3
1 files changed, 0 insertions, 3 deletions
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index b14749a8f3..6641dbc576 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/bin/toaster
@@ -33,9 +33,6 @@ webserverKillAll()
33 while kill -0 $pid 2>/dev/null; do 33 while kill -0 $pid 2>/dev/null; do
34 kill -SIGTERM -$pid 2>/dev/null 34 kill -SIGTERM -$pid 2>/dev/null
35 sleep 1 35 sleep 1
36 # Kill processes if they are still running - may happen
37 # in interactive shells
38 ps fux | grep "python.*manage.py runserver" | awk '{print $2}' | xargs kill
39 done 36 done
40 rm ${pidfile} 37 rm ${pidfile}
41 fi 38 fi