diff options
author | Nico Weber <thakis@chromium.org> | 2021-08-28 13:09:12 -0400 |
---|---|---|
committer | Linus Groh <mail@linusgroh.de> | 2021-08-28 21:51:30 +0100 |
commit | 4f3c0fa659b312e994fecbfc65d27982c6745884 (patch) | |
tree | 97efc391f588fcdf6442944691813a2035740363 /Meta/run.sh | |
parent | 230ea3754d0eb929f0ab5f79439b004fa08e0d6c (diff) | |
download | serenity-4f3c0fa659b312e994fecbfc65d27982c6745884.zip |
Meta: Disable spice in aarch64 buils in run.sh
Diffstat (limited to 'Meta/run.sh')
-rwxr-xr-x | Meta/run.sh | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/Meta/run.sh b/Meta/run.sh index 217c668916..bf5f43ac3f 100755 --- a/Meta/run.sh +++ b/Meta/run.sh @@ -125,10 +125,12 @@ fi [ -z "$SERENITY_QEMU_CPU" ] && SERENITY_QEMU_CPU="max" [ -z "$SERENITY_CPUS" ] && SERENITY_CPUS="2" -if [ -z "$SERENITY_SPICE" ] && "${SERENITY_QEMU_BIN}" -chardev help | grep -iq qemu-vdagent; then - SERENITY_SPICE_SERVER_CHARDEV="-chardev qemu-vdagent,clipboard=on,mouse=off,id=vdagent,name=vdagent" -elif "${SERENITY_QEMU_BIN}" -chardev help | grep -iq spicevmc; then - SERENITY_SPICE_SERVER_CHARDEV="-chardev spicevmc,id=vdagent,name=vdagent" +if [ "$SERENITY_ARCH" != "aarch64" ]; then + if [ -z "$SERENITY_SPICE" ] && "${SERENITY_QEMU_BIN}" -chardev help | grep -iq qemu-vdagent; then + SERENITY_SPICE_SERVER_CHARDEV="-chardev qemu-vdagent,clipboard=on,mouse=off,id=vdagent,name=vdagent" + elif "${SERENITY_QEMU_BIN}" -chardev help | grep -iq spicevmc; then + SERENITY_SPICE_SERVER_CHARDEV="-chardev spicevmc,id=vdagent,name=vdagent" + fi fi if [ "$(uname)" = "Darwin" ]; then @@ -208,11 +210,13 @@ $SERENITY_AUDIO_HW -device ich9-ahci,bus=bridge3 " -if "${SERENITY_QEMU_BIN}" -chardev help | grep -iq spice; then - SERENITY_COMMON_QEMU_ARGS="$SERENITY_COMMON_QEMU_ARGS - -spice port=5930,agent-mouse=off,disable-ticketing=on - -device virtserialport,chardev=vdagent,nr=1 - " +if [ "$SERENITY_ARCH" != "aarch64" ]; then + if "${SERENITY_QEMU_BIN}" -chardev help | grep -iq spice; then + SERENITY_COMMON_QEMU_ARGS="$SERENITY_COMMON_QEMU_ARGS + -spice port=5930,agent-mouse=off,disable-ticketing=on + -device virtserialport,chardev=vdagent,nr=1 + " + fi fi [ -z "$SERENITY_COMMON_QEMU_Q35_ARGS" ] && SERENITY_COMMON_QEMU_Q35_ARGS=" |