[OE-core][scarthgap 13/18] runqemu: Fix detection of -serial parameter

Steve Sakoman
2024-10-15T18:51:30Z

From: Jörg Sommer <joerg.sommer@navimatix.de>

The pattern `-serial` matches also `-device usb-serial` and `virtio-serial`
which are not the desired parameter. This causes the serial console ttyS1 is
missing and Systemd's getty@ttyS1 fails constantly.

Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit b6d035894120b45b42f146ab5b3110522c58d178)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
scripts/runqemu | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/runqemu b/scripts/runqemu
index fe395d1bc6..2ab36fd03d 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -1487,7 +1487,7 @@ to your build configuration.
# If no serial or serialtcp options were specified, only ttyS0 is created
# and sysvinit shows an error trying to enable ttyS1:
# INIT: Id "S1" respawning too fast: disabled for 5 minutes
- serial_num = len(re.findall("-serial", self.qemu_opt))
+ serial_num = len(re.findall("(^| )-serial ", self.qemu_opt))

# Assume if the user passed serial options, they know what they want
# and pad to two devices
@@ -1507,7 +1507,7 @@ to your build configuration.

self.qemu_opt += " %s" % self.get("QB_SERIAL_OPT")

- serial_num = len(re.findall("-serial", self.qemu_opt))
+ serial_num = len(re.findall("(^| )-serial ", self.qemu_opt))
if serial_num < 2:
self.qemu_opt += " -serial null"

--
2.34.1