From acd0fe1bc38746f36fff24a7497041e5c5010977 Mon Sep 17 00:00:00 2001 From: salmonik Date: Thu, 27 Aug 2026 18:35:59 +0200 Subject: scripts: migrate all QEMU/test scripts to single system image boot.sh: replace esp/ + DISK_IMG with single SYSTEM_IMG on ide.0 (hooks into mksystem.sh --force for auto-staging). boot-image.sh: delegate to mksystem.sh --chain (build-image.sh deleted). build-image-release.sh: delegate to mksystem.sh --chain --gpt. qemu.sh: flexible launcher uses SYSTEM_IMG; --chain flag for full-chain build. test-disk.sh: drop ESP_DIR (mksystem.sh stages everything). test-fault.sh: boot system.img on ide.0 + CRASHLOG stick on ide.1; replace deleted mkdisk.sh with inline mkfs.fat. test-gfx.sh: system.img on ide.0, stage via mksystem.sh. test-mouse.sh: system.img on ide.0, stage via mksystem.sh. test-msg.sh: system.img on ide.0, stage via mksystem.sh. Makefile: remove stale build-image.sh/mkdisk.sh references from help; image target delegates to mksystem.sh --chain. All scripts syntax-checked (bash -n). build-image.sh and mkdisk.sh no longer referenced anywhere. --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 6f7f545..be55e4e 100644 --- a/Makefile +++ b/Makefile @@ -136,7 +136,7 @@ bootloader: # Build the full boot chain disk image (kernel + bootloader) image: all - ./scripts/build-image.sh rs-dos.img +./scripts/mksystem.sh --chain rs-dos.img # Boot the full chain disk image (builds it first if needed) boot-image: all @@ -168,11 +168,9 @@ help: @echo " make fmt format Rust source" @echo " ./scripts/mksystem.sh build the dd-able system image" @echo " ./scripts/boot.sh quick direct boot (dev loop)" - @echo " ./scripts/mkdisk.sh create/re-format the data disk" @echo " ./scripts/test-disk.sh automated disk round trip" @echo " ./scripts/sendkeys.py type into QEMU via the monitor" @echo " ./scripts/boot-image.sh boot full chain (builds if needed)" - @echo " ./scripts/build-image.sh build full chain disk image" @echo " ./scripts/build-bootloader.sh build rsboot from source" @echo " ./scripts/qemu.sh flexible QEMU launcher" @echo " ./scripts/debug-kernel.py GDB plugin (attach after 'make debug')" -- cgit v1.2.3