From: Randy Witt Date: Wed, 26 Aug 2015 22:15:34 +0000 (-0700) Subject: runqemu-internal: Make sure tcpserial is always last X-Git-Tag: 2015-10~766 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=c71309616a3247cfab969b74d8642ff0bf9b6500;p=openembedded-core.git runqemu-internal: Make sure tcpserial is always last If this is not the case, sometimes the additional tcpserial will be enumerated as ttyS0, which is not what we want. Because then it would be the console, and qemurunner would not log things properly. Signed-off-by: Randy Witt Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal index b317358f94..baf53f3e8b 100755 --- a/scripts/runqemu-internal +++ b/scripts/runqemu-internal @@ -622,9 +622,9 @@ fi if [ $TCPSERIAL_PORTNUM != "" ]; then if [ "$MACHINE" = "qemuarm64" ]; then - QEMUOPTIONS="$QEMUOPTIONS -device virtio-serial-device -chardev socket,id=virtcon,port=$TCPSERIAL_PORTNUM,host=127.0.0.1 -device virtconsole,chardev=virtcon" + SCRIPT_QEMU_EXTRA_OPT="$SCRIPT_QEMU_EXTRA_OPT -device virtio-serial-device -chardev socket,id=virtcon,port=$TCPSERIAL_PORTNUM,host=127.0.0.1 -device virtconsole,chardev=virtcon" else - QEMUOPTIONS="$QEMUOPTIONS -serial tcp:127.0.0.1:$TCPSERIAL_PORTNUM" + SCRIPT_QEMU_EXTRA_OPT="$SCRIPT_QEMU_EXTRA_OPT -serial tcp:127.0.0.1:$TCPSERIAL_PORTNUM" fi fi