Skip to contentSkip to conversation

runqemu: work without SERIAL_CONSOLES being defined

PATCH New Jon Mason 1 participant 1 message Nov 2, 2021

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

PATCH 1/1 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.

---
 scripts/runqemu | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/runqemu +1 -1
index 1143509975d0..d4f0888f8da2 100755
@@ -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]
 
Signature · 1 line
2.20.1