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

Meta: Add env variable SERENITY_RUN to be able to choose qemu, bochs, etc

Browse source 
This allows picking for example bochs: SERENITY_RUN=b ninja run
This commit is contained in:
Tom 2020-09-18 13:50:20 -06:00 • committed by Andreas Kling
parent 724c5bd8d9
commit e317ee7541
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Meta/run.sh
View file

@ -67,7 +67,9 @@ export SDL_VIDEO_X11_DGAMOUSE=0
: "${SERENITY_BUILD:=.}" : "${SERENITY_BUILD:=.}"
cd -P -- "$SERENITY_BUILD" || die "Could not cd to \"$SERENITY_BUILD\"" cd -P -- "$SERENITY_BUILD" || die "Could not cd to \"$SERENITY_BUILD\""
if [ "$1" = "b" ]; then SERENITY_RUN="${SERENITY_RUN:-$1}"
if [ "$SERENITY_RUN" = "b" ]; then
# Meta/run.sh b: bochs # Meta/run.sh b: bochs
[ -z "$SERENITY_BOCHSRC" ] && { [ -z "$SERENITY_BOCHSRC" ] && {
# Make sure that SERENITY_ROOT is set and not empty # Make sure that SERENITY_ROOT is set and not empty
@ -75,14 +77,14 @@ if [ "$1" = "b" ]; then
SERENITY_BOCHSRC="$SERENITY_ROOT/Meta/bochsrc" SERENITY_BOCHSRC="$SERENITY_ROOT/Meta/bochsrc"
} }
"$SERENITY_BOCHS_BIN" -q -f "$SERENITY_BOCHSRC" "$SERENITY_BOCHS_BIN" -q -f "$SERENITY_BOCHSRC"
elif [ "$1" = "qn" ]; then elif [ "$SERENITY_RUN" = "qn" ]; then
# Meta/run.sh qn: qemu without network # Meta/run.sh qn: qemu without network
"$SERENITY_QEMU_BIN" \ "$SERENITY_QEMU_BIN" \
$SERENITY_COMMON_QEMU_ARGS \ $SERENITY_COMMON_QEMU_ARGS \
-device e1000 \ -device e1000 \
-kernel Kernel/Kernel \ -kernel Kernel/Kernel \
-append "${SERENITY_KERNEL_CMDLINE}" -append "${SERENITY_KERNEL_CMDLINE}"
elif [ "$1" = "qtap" ]; then elif [ "$SERENITY_RUN" = "qtap" ]; then
# Meta/run.sh qtap: qemu with tap # Meta/run.sh qtap: qemu with tap
sudo "$SERENITY_QEMU_BIN" \ sudo "$SERENITY_QEMU_BIN" \
$SERENITY_COMMON_QEMU_ARGS \ $SERENITY_COMMON_QEMU_ARGS \
@ -92,7 +94,7 @@ elif [ "$1" = "qtap" ]; then
-device e1000,netdev=br0 \ -device e1000,netdev=br0 \
-kernel Kernel/Kernel \ -kernel Kernel/Kernel \
-append "${SERENITY_KERNEL_CMDLINE}" -append "${SERENITY_KERNEL_CMDLINE}"
elif [ "$1" = "qgrub" ]; then elif [ "$SERENITY_RUN" = "qgrub" ]; then
# Meta/run.sh qgrub: qemu with grub # Meta/run.sh qgrub: qemu with grub
"$SERENITY_QEMU_BIN" \ "$SERENITY_QEMU_BIN" \
$SERENITY_COMMON_QEMU_ARGS \ $SERENITY_COMMON_QEMU_ARGS \
@ -100,7 +102,7 @@ elif [ "$1" = "qgrub" ]; then
$SERENITY_PACKET_LOGGING_ARG \ $SERENITY_PACKET_LOGGING_ARG \
-netdev user,id=breh,hostfwd=tcp:127.0.0.1:8888-10.0.2.15:8888,hostfwd=tcp:127.0.0.1:8823-10.0.2.15:23 \ -netdev user,id=breh,hostfwd=tcp:127.0.0.1:8888-10.0.2.15:8888,hostfwd=tcp:127.0.0.1:8823-10.0.2.15:23 \
-device e1000,netdev=breh -device e1000,netdev=breh
elif [ "$1" = "q35_cmd" ]; then elif [ "$SERENITY_RUN" = "q35_cmd" ]; then
# Meta/run.sh q35_cmd: qemu (q35 chipset) with SerenityOS with custom commandline # Meta/run.sh q35_cmd: qemu (q35 chipset) with SerenityOS with custom commandline
shift shift
SERENITY_KERNEL_CMDLINE="$*" SERENITY_KERNEL_CMDLINE="$*"
@ -112,7 +114,7 @@ elif [ "$1" = "q35_cmd" ]; then
-device e1000,netdev=breh \ -device e1000,netdev=breh \
-kernel Kernel/Kernel \ -kernel Kernel/Kernel \
-append "${SERENITY_KERNEL_CMDLINE}" -append "${SERENITY_KERNEL_CMDLINE}"
elif [ "$1" = "qcmd" ]; then elif [ "$SERENITY_RUN" = "qcmd" ]; then
# Meta/run.sh qcmd: qemu with SerenityOS with custom commandline # Meta/run.sh qcmd: qemu with SerenityOS with custom commandline
shift shift
SERENITY_KERNEL_CMDLINE="$*" SERENITY_KERNEL_CMDLINE="$*"