From: Jon Mason Date: Tue, 2 Nov 2021 19:59:12 +0000 (-0400) Subject: runqemu: work without SERIAL_CONSOLES being defined X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~6238 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8359000e765f876c041b6ccabe63f069f83efec;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git runqemu: work without SERIAL_CONSOLES being defined Not all machine definitions need to have SERIAL_CONSOLES defined, but runqemu currently will fail with the following script error if not present: Traceback (most recent call last): File "/builder/meta-arm/poky/scripts/runqemu", line 1604, in main config.setup_final() File "/builder/meta-arm/poky/scripts/runqemu", line 1446, in setup_final self.setup_serial() File "/builder/meta-arm/poky/scripts/runqemu", line 1381, in setup_serial self.kernel_cmdline_script += ' console=%s' %entry.split(';')[1] IndexError: list index out of range To get around this issue, add a sanity check to runqemu to avoid the parsing of SERIAL_CONSOLES if empty. Signed-off-by: Jon Mason Signed-off-by: Richard Purdie --- diff --git a/scripts/runqemu b/scripts/runqemu index 1143509975d..d4f0888f8da 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -1376,7 +1376,7 @@ class BaseConfig(object): def setup_serial(self): # Setup correct kernel command line for serial - if self.serialstdio == True or self.serialconsole == True or self.nographic == True or self.tcpserial_portnum: + if self.get('SERIAL_CONSOLES') and (self.serialstdio == True or self.serialconsole == True or self.nographic == True or self.tcpserial_portnum): for entry in self.get('SERIAL_CONSOLES').split(' '): self.kernel_cmdline_script += ' console=%s' %entry.split(';')[1]