diff options
| author | salmonik <salmonik@tuta.io> | 2026-11-01 15:53:29 +0100 |
|---|---|---|
| committer | salmonik <salmonik@tuta.io> | 2026-11-01 15:53:29 +0100 |
| commit | 7958276c9f0d230053520ba20f2a00f5ecda18e4 (patch) | |
| tree | 596f5f71ad597ed951bae98de818cb37f171a18d /scripts/build-bootloader.sh | |
| parent | fs: /bin alias for the system volume (diff) | |
| download | rs-dos-7958276c9f0d230053520ba20f2a00f5ecda18e4.tar.gz rs-dos-7958276c9f0d230053520ba20f2a00f5ecda18e4.zip | |
scripts: rebuild the dev loop around build.sh/run.sh
`make` did not parse at all (missing separator at line 139), so every
make target was dead. The folder also carried three overlapping
launchers (boot.sh, qemu.sh, boot-image.sh) plus a fourth partial one
in the Makefile, `cargo build --package rsdos` copy-pasted eight times,
the QEMU invocation copy-pasted per script, and the test helpers
(fail/wait_log/wait_qemu_exit/qemu_hmp) duplicated in five tests.
New layout:
- scripts/lib.sh: single config (image, OVMF, mem/smp), the one cargo
invocation (build_all), the one QEMU shape (qemu_args), and the test
harness (test_boot, wait_log, wait_qemu_exit, qemu_hmp, sendkeys)
- scripts/build.sh: kernel + every bins/* in one pass
- scripts/mksystem.sh: freshness-aware image build that now stages
every bins/*.efi into /bin/cli|gui (they were never copied before)
- scripts/run.sh: build + stage + boot in one command; --headless,
--debug (GDB stub), --monitor (HMP socket), --fresh, --mem/--smp/
--bios/--image; on Wayland it auto-selects XWayland plus
grab-on-hover so the mouse can be captured (Ctrl+Alt+G toggles)
- scripts/tests/: the five automated tests on the shared harness
- deleted: boot.sh, qemu.sh, boot-image.sh, lib-boot-args.sh,
build-image-release.sh, build-bootloader.sh (rsboot chain dropped)
The Makefile is now a thin wrapper: make run, make test, make system,
make inspect, make help. Two-command flow: ./scripts/build.sh then
./scripts/run.sh (run.sh alone also works).
Stale test assumptions fixed so the suite is green again: test-gfx
waited for "gfx: check" while the shell prints "gfx check: PASS";
test-mouse/test-msg hardcoded msgrecv = task 3 (wm-input took slot 3 —
ids are parsed from the log now); the queue-full probe targeted task 0,
whose exec pump drains its own queue as completion codes (moved to the
cursor task, which never recvs).
Verified in QEMU: make test -> test-disk, test-gfx, test-mouse,
test-msg, test-fault all PASS.
Diffstat (limited to 'scripts/build-bootloader.sh')
| -rwxr-xr-x | scripts/build-bootloader.sh | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/scripts/build-bootloader.sh b/scripts/build-bootloader.sh deleted file mode 100755 index f0f0ce7..0000000 --- a/scripts/build-bootloader.sh +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | #!/usr/bin/env bash | ||
| 2 | # | ||
| 3 | # scripts/build-bootloader.sh — build rsboot (UEFI bootloader) | ||
| 4 | # | ||
| 5 | # rsboot is a git submodule at rsboot/. This builds it and places | ||
| 6 | # BOOTX64.EFI into build/bootloader/. | ||
| 7 | # | ||
| 8 | # Usage: | ||
| 9 | # ./scripts/build-bootloader.sh | ||
| 10 | # | ||
| 11 | # Output: | ||
| 12 | # build/bootloader/BOOTX64.EFI | ||
| 13 | # | ||
| 14 | set -euo pipefail | ||
| 15 | |||
| 16 | SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" | ||
| 17 | PROJECT_DIR="$(dirname "$SCRIPT_DIR")" | ||
| 18 | BUILD_DIR="$PROJECT_DIR/build" | ||
| 19 | BOOTLOADER_DIR="$BUILD_DIR/bootloader" | ||
| 20 | |||
| 21 | echo "=== Building rsboot (UEFI bootloader) ===" | ||
| 22 | |||
| 23 | # Ensure submodule is checked out, tracking the latest upstream HEAD | ||
| 24 | # (--remote fetches and checks out the newest main instead of reverting | ||
| 25 | # to the commit recorded in the superproject's gitlink). | ||
| 26 | cd "$PROJECT_DIR" | ||
| 27 | git submodule update --init --remote rsboot | ||
| 28 | |||
| 29 | cd "$PROJECT_DIR/rsboot" | ||
| 30 | make clean 2>/dev/null || true | ||
| 31 | make -j"$(nproc)" 2>&1 | sed 's/^/ /' | ||
| 32 | |||
| 33 | echo "" | ||
| 34 | echo "=== rsboot build complete ===" | ||
| 35 | ls -lh "$BOOTLOADER_DIR/BOOTX64.EFI" | ||
