test(build): Zuse's minted pair as a stick -- the acceptance boots and the sessions use it
mkdiskimage.sh --starship-from IDENT ART lays a minted pair out as a StarshipOS stick: an identity partition holding IDENT's bytes and an Artemis partition holding ART's, each exactly its file's size (Artemis's signature and fence are placed from the volume's size). kernel/Makefile: a zusestick target, made fresh for every boot, is ZUSEDISK's default (ZUSE_PAIR names the pair); STICK_PAIR puts the pair in the PC stick. qemu_session.py's Zuse drive is the pair as a stick. check_images.sh checks both forms byte for byte against the pair (60 PASS). On today's kernel all 23 sessions pass on the Zuse stick, and acceptance: amd64, aarch64, riscv64 to [zuse@Hera] ok>, POST 538/538, dict_hash 0xfec8c47cfc6f437f; v4 suite and test-32 0 failures. The plan gains Task 5, screen=boot (ruled 2026-10-28). Plan: docs/v4.0.0/plans/2026-10-27-stick-4-one-disk.md, Task 1 (R1 as recommended). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5.5
parent
b2278b6204
commit
38b2b9693a
@@ -4,6 +4,9 @@
|
||||
#
|
||||
# The stick: make boot_image TARGET=PC -> build/boards/pc/lithos-pc.img
|
||||
# The data stick: make -f kernel/Makefile ARCH=amd64 datastick -> build/amd64/kernel/datastick.img
|
||||
# Zuse's pair as a stick (docs/v4.0.0/plans/2026-10-27-stick-4-one-disk.md, Task 1):
|
||||
# make -f kernel/Makefile ARCH=amd64 zusestick -> build/amd64/kernel/zusestick.img
|
||||
# make boot_image TARGET=PC STICK_PAIR=disk/zuse-scratch -> the PC stick with the pair in it
|
||||
#
|
||||
# Prints PASS:/FAIL: per check and RESULT:; exits 0 only if every check passes.
|
||||
set -uo pipefail
|
||||
@@ -12,6 +15,8 @@ PATH="$PATH:/usr/sbin:/sbin"
|
||||
|
||||
STICK=build/boards/pc/lithos-pc.img
|
||||
DATA=build/amd64/kernel/datastick.img
|
||||
ZSTICK=build/amd64/kernel/zusestick.img
|
||||
PAIR=disk/zuse-scratch
|
||||
MKARTEMIS=build/amd64/kernel/tools/mkartemis
|
||||
ESP_T=C12A7328-F81F-11D2-BA4B-00A0C93EC93B
|
||||
IDENT_T=23BEBFE1-4817-4CF3-A537-9069BF159788
|
||||
@@ -61,6 +66,13 @@ artemis_check() { # artemis_check IMG N -- mkartemis --check on partition N
|
||||
"$MKARTEMIS" --check "$1" --first-lba "$(part "$1" "$2" start)" --sectors "$(part "$1" "$2" size)"
|
||||
}
|
||||
|
||||
same() { # same IMG N FILE -- partition N holds FILE's bytes, and is exactly its size
|
||||
local s z
|
||||
s=$(part "$1" "$2" start); z=$(part "$1" "$2" size)
|
||||
[ -n "$s" ] && [ -n "$z" ] && [ $((z * 512)) -eq "$(stat -c %s "$3")" ] &&
|
||||
cmp -s -i "$((s * 512)):0" -n "$((z * 512))" "$1" "$3"
|
||||
}
|
||||
|
||||
uuid() { artemis_check "$1" "$2" 2>/dev/null | sed -n 's/.*disk_uuid \([0-9a-f]*\).*/\1/p'; }
|
||||
|
||||
echo "== building"
|
||||
@@ -98,6 +110,32 @@ check "the data stick builds again" make -f kernel/Makefile ARCH=amd64 datastick
|
||||
U2=$(uuid "$DATA" 2)
|
||||
check "made again, it is fresh: its own disk_uuid ($U1 / $U2)" test -n "$U1" -a -n "$U2" -a "$U1" != "$U2"
|
||||
|
||||
echo "== Zuse's pair as a stick ($ZSTICK)"
|
||||
rm -f "$ZSTICK"
|
||||
check "it builds (make zusestick)" make -f kernel/Makefile ARCH=amd64 zusestick
|
||||
check "it exists, 1090 MiB (1 + 64 + 1024 + 1)" eq "$(stat -c %s "$ZSTICK" 2>/dev/null)" "$((1090 * 1048576))"
|
||||
check "two partitions" eq "$(part "$ZSTICK" 0 count)" 2
|
||||
check "1: StarshipOS identity, 64 MiB at LBA 2048" eq "$(part "$ZSTICK" 1 type)/$(part "$ZSTICK" 1 start)/$(part "$ZSTICK" 1 size)" "$IDENT_T/2048/131072"
|
||||
check "2: StarshipOS Artemis, 1 GiB after it" eq "$(part "$ZSTICK" 2 type)/$(part "$ZSTICK" 2 start)/$(part "$ZSTICK" 2 size)" "$ART_T/133120/2097152"
|
||||
check "sfdisk --verify: the GPT is clean" sfdisk --verify "$ZSTICK"
|
||||
check "the identity partition is $PAIR/zuse-thumb-ident.img" same "$ZSTICK" 1 "$PAIR/zuse-thumb-ident.img"
|
||||
check "the Artemis partition is $PAIR/artemis.img" same "$ZSTICK" 2 "$PAIR/artemis.img"
|
||||
check "Artemis: STFR v2, signature ok" artemis_check "$ZSTICK" 2
|
||||
|
||||
echo "== the PC stick with the pair in it (STICK_PAIR=$PAIR)"
|
||||
rm -f "$STICK"
|
||||
check "it builds (make boot_image TARGET=PC STICK_PAIR=$PAIR)" make boot_image TARGET=PC STICK_PAIR=$PAIR
|
||||
check "three partitions" eq "$(part "$STICK" 0 count)" 3
|
||||
check "1: EFI System, 64 MiB at LBA 2048" eq "$(part "$STICK" 1 type)/$(part "$STICK" 1 start)/$(part "$STICK" 1 size)" "$ESP_T/2048/131072"
|
||||
check "2: StarshipOS identity, 64 MiB" eq "$(part "$STICK" 2 type)/$(part "$STICK" 2 start)/$(part "$STICK" 2 size)" "$IDENT_T/133120/131072"
|
||||
check "3: StarshipOS Artemis, 1 GiB" eq "$(part "$STICK" 3 type)/$(part "$STICK" 3 start)/$(part "$STICK" 3 size)" "$ART_T/264192/2097152"
|
||||
check "sfdisk --verify: the GPT is clean" sfdisk --verify "$STICK"
|
||||
check "the ESP holds EFI/BOOT/BOOTX64.EFI" mdir -i "$STICK@@$OFF" ::/EFI/BOOT/BOOTX64.EFI
|
||||
check "the identity partition is the pair's" same "$STICK" 2 "$PAIR/zuse-thumb-ident.img"
|
||||
check "the Artemis partition is the pair's" same "$STICK" 3 "$PAIR/artemis.img"
|
||||
check "Artemis: STFR v2, signature ok" artemis_check "$STICK" 3
|
||||
check "a pair file that is not a whole MiB is refused" eval '{ bash scripts/mkdiskimage.sh --out build/amd64/kernel/tools/check-images/odd.img --table gpt --label X --esp-mib 0 --starship-from scripts/check_images.sh "$PAIR/artemis.img" 2>&1 || true; } | grep -q "not a whole MiB"'
|
||||
|
||||
echo "== mkartemis refuses what it cannot do safely"
|
||||
T=build/amd64/kernel/tools/check-images; mkdir -p "$T"
|
||||
fresh() { rm -f "$T/t.img"; truncate -s 64M "$T/t.img"; }
|
||||
|
||||
Reference in New Issue
Block a user