mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

runqemu: Fix detection of -serial parameter

Browse Source 
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.

(From OE-Core rev: 44c1f003d617ac20527926b4b321ffd1fe4462bb)

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>
This commit is contained in:
Jörg Sommer
2024-08-29 20:33:45 +02:00
committed by Steve Sakoman
parent 008e269c6b
commit f43ef3aa92
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/runqemu
View File

@@ -1487,7 +1487,7 @@ to your build configuration.
# If no serial or serialtcp options were specified, only ttyS0 is created # If no serial or serialtcp options were specified, only ttyS0 is created
# and sysvinit shows an error trying to enable ttyS1: # and sysvinit shows an error trying to enable ttyS1:
# INIT: Id "S1" respawning too fast: disabled for 5 minutes # 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 # Assume if the user passed serial options, they know what they want
# and pad to two devices # and pad to two devices
@@ -1507,7 +1507,7 @@ to your build configuration.
self.qemu_opt += " %s" % self.get("QB_SERIAL_OPT") 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: if serial_num < 2:
self.qemu_opt += " -serial null" self.qemu_opt += " -serial null"