summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorStefan Stanacar <stefanx.stanacar@intel.com>2013-07-30 02:00:01 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-03 10:33:02 +0100
commit26d67b98f8583c501b9978405f7e602f25f16475 (patch)
treeea8c7c5706fb7d31baf92311a53d16016c7b190d /meta
parentfce0c9906f9590d234cc5f3c3457bf6c03231ae6 (diff)
downloadpoky-26d67b98f8583c501b9978405f7e602f25f16475.tar.gz
oeqa/utils/qemurunner: tweak console bootparam and ip command
Sync serial baud rate with default inittab which should help with apparent boot fails. Also keep a console on tty1. Also we shouldn't assume eth0 it the right interface. (systemd images can rename interfaces to something else). (From OE-Core rev: d5620c0b6782b88f3e6de97b1ddadcf21207fc57) Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oeqa/utils/qemurunner.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index 02e0a4a11d..45b3ccb789 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -25,7 +25,7 @@ class QemuRunner:
25 self.rootfs = rootfs 25 self.rootfs = rootfs
26 26
27 self.streampath = '/tmp/qemuconnection.%s' % os.getpid() 27 self.streampath = '/tmp/qemuconnection.%s' % os.getpid()
28 self.qemuparams = 'bootparams="console=ttyS0" qemuparams="-serial unix:%s,server,nowait"' % self.streampath 28 self.qemuparams = 'bootparams="console=tty1 console=ttyS0,115200n8" qemuparams="-serial unix:%s,server,nowait"' % self.streampath
29 self.qemupid = None 29 self.qemupid = None
30 self.ip = None 30 self.ip = None
31 31
@@ -76,7 +76,7 @@ class QemuRunner:
76 if not match: 76 if not match:
77 bb.note("Couldn't get prompt, all I got was:\n%s" % match.group(0)) 77 bb.note("Couldn't get prompt, all I got was:\n%s" % match.group(0))
78 return False 78 return False
79 console.write("ip addr show eth0 | sed -n '3p' | awk '{ print $2 }' | cut -f 1 -d \"/\"\n") 79 console.write("ip addr show `ip route list | sed -n '1p' | awk '{print $5}'` | sed -n '3p' | awk '{ print $2 }' | cut -f 1 -d \"/\"\n")
80 (index, match, text) = console.expect([r"((?:[0-9]{1,3}\.){3}[0-9]{1,3})"],10) 80 (index, match, text) = console.expect([r"((?:[0-9]{1,3}\.){3}[0-9]{1,3})"],10)
81 console.close() 81 console.close()
82 if match: 82 if match: