mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 12:59:02 +02:00
runqemu: Fix detection of -serial parameter
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: b6d035894120b45b42f146ab5b3110522c58d178) Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
9ec017b0fd
commit
4b60e8690c
|
@ -1483,7 +1483,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
|
||||||
|
@ -1503,7 +1503,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"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user