RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 12:07:45 +00:00
Code Issues Activity Actions

Meta: Unbreak serenity.sh run aarch64 after 918f7cb4a8

Browse source
This commit is contained in:
Nico Weber 2021-09-06 13:26:58 -04:00 • committed by Linus Groh
parent 95ff65e211
commit f1d1418256
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Meta/run.sh
View file

@ -123,13 +123,14 @@ if command -v wslpath >/dev/null; then
fi fi
[ -z "$SERENITY_QEMU_CPU" ] && SERENITY_QEMU_CPU="max" [ -z "$SERENITY_QEMU_CPU" ] && SERENITY_QEMU_CPU="max"
[ -z "$SERENITY_CPUS" ] && SERENITY_CPUS="2"
if [ "$SERENITY_CPUS" -le 8 ]; then
# Explicitly disable x2APIC so we can test it more easily
SERENITY_QEMU_CPU="$SERENITY_QEMU_CPU,-x2apic"
fi
if [ "$SERENITY_ARCH" != "aarch64" ]; then if [ "$SERENITY_ARCH" != "aarch64" ]; then
[ -z "$SERENITY_CPUS" ] && SERENITY_CPUS="2"
if [ "$SERENITY_CPUS" -le 8 ]; then
# Explicitly disable x2APIC so we can test it more easily
SERENITY_QEMU_CPU="$SERENITY_QEMU_CPU,-x2apic"
fi
if [ -z "$SERENITY_SPICE" ] && "${SERENITY_QEMU_BIN}" -chardev help | grep -iq qemu-vdagent; 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" 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 elif "${SERENITY_QEMU_BIN}" -chardev help | grep -iq spicevmc; then