From 3d5add028a7728d6b2aed87d46a13a06fb9313a0 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 25 Apr 2013 11:15:26 +0100 Subject: [PATCH] qemuimage-testlib-pythonhelper: Make the process detection more strict Old versions of ldd (2.11) as run on some of the autobuilders end up running commands like "LD_xxxx qemu-system-xxx" which this process detection code would pick up and result in the wrong PID for qemu. This changes the code to check for "192.168" in the command so we know we're getting the correct one. This is less than ideal however we're running out of options and resolves false negatives we see on the autobuilder. (From OE-Core rev: 7b43151bb073f1f6f1fa5a31447b742127060909) Signed-off-by: Richard Purdie Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- scripts/qemuimage-testlib-pythonhelper | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/qemuimage-testlib-pythonhelper b/scripts/qemuimage-testlib-pythonhelper index 4e6432b..6435dd8 100755 --- a/scripts/qemuimage-testlib-pythonhelper +++ b/scripts/qemuimage-testlib-pythonhelper @@ -54,9 +54,10 @@ if options.findqemu: #print "Children matching %s:" % str(parents) for p in parents: # Need to be careful here since runqemu-internal runs "ldd qemu-system-xxxx" + # Also, old versions of ldd (2.11) run "LD_XXXX qemu-system-xxxx" basecmd = commands[p].split()[0] basecmd = os.path.basename(basecmd) - if "qemu-system" in basecmd: + if "qemu-system" in basecmd and "192.168" in commands[p]: print p sys.exit(0) sys.exit(1) -- 2.7.4