[gnome-continuous-yocto/gnomeostree-3.28-rocko: 1185/8267] runqemu: Avoid duplicating custom QEMU options for AArch64

[Emmanuele Bassi <ebassi src gnome org>]

commit dc626e3bdc1aeae1f3d79ea78b61a581b5e6ea3e
Author: Otavio Salvador <otavio ossystems com br>
Date:   Wed Jun 29 17:08:11 2016 -0300

    runqemu: Avoid duplicating custom QEMU options for AArch64
    
    When detecting the second serial options we shouldn't append the
    custom QEMU options otherwise we will end duplicating those.
    
    (From OE-Core rev: 79798f20b2c0b98d84c3c4b14600635ff8ddfdad)
    
    Signed-off-by: Otavio Salvador <otavio ossystems com br>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/runqemu-internal |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index ea1a307..3f413e7 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -681,7 +681,7 @@ fi
 # qemuarm64 uses virtio for any additional serial ports so the normal mechanism
 # of using -serial will not work
 if [ "$MACHINE" = "qemuarm64" ]; then
-    SECOND_SERIAL_OPT="$SCRIPT_QEMU_EXTRA_OPT -device virtio-serial-device -chardev null,id=virtcon -device 
virtconsole,chardev=virtcon"
+    SECOND_SERIAL_OPT="-device virtio-serial-device -chardev null,id=virtcon -device 
virtconsole,chardev=virtcon"
 else
     SECOND_SERIAL_OPT="-serial null"
 fi