v4 fabric to spec: the mesh boot, the one adaptive heartbeat, mechanism A (#189) #197

Merged
rajames merged 160 commits from StarForth-v4.0.0 into master 2026-11-19 11:19:50 +00:00
6 changed files with 9 additions and 8 deletions
Showing only changes of commit 9415d7ede3 - Show all commits
+2 -2
View File
@@ -144,8 +144,8 @@ make boot_image TARGET=MILKV EMERGENCY_CONSOLE_ENABLED=1
thumbdrive attached. After a clean build it does (tried on `MILKV`).
- [ ] The Pi 5 build fetches the board's DTB once from the pinned firmware release; with no
network, pass `RPI5_DTB=/path/to/bcm2712-rpi-5-b.dtb`.
- [ ] Put back `v3/include/version.h` and `capsules/BLOCK_MAP.md` afterwards: the build
rewrites both.
- [ ] Put back `capsules/BLOCK_MAP.md` afterwards if the build was signed: a signed build rewrites
its Signed column. (`v3/include/version.h` is untracked since 2026-11-11, #145.)
### 3.2 Rehearse each image as its own disk
+1 -1
View File
@@ -20,5 +20,5 @@ mformat -i "$tmp/efi.img" ::
mmd -i "$tmp/efi.img" ::/EFI ::/EFI/BOOT
mcopy -i "$tmp/efi.img" build/amd64/kernel/starkernel_loader.efi ::/EFI/BOOT/BOOTX64.EFI
xorriso -as mkisofs -r -J -e efi.img -no-emul-boot -o "$out" "$tmp" 2>/dev/null
git checkout -q -- capsules/BLOCK_MAP.md v3/include/version.h 2>/dev/null || true # the build regenerates these
git checkout -q -- capsules/BLOCK_MAP.md 2>/dev/null || true # a signed build rewrites it; version.h is untracked (#145)
echo "demo: $out"
+1 -1
View File
@@ -53,5 +53,5 @@ boot "Zuse: genesis minted onto attached thumbdrive" "fence marker write FAILED"
boot "Zuse: identity confirmed from attached thumbdrive" "not recognized"
make --no-print-directory -f kernel/Makefile ARCH=amd64 zusestick ZUSE_PAIR="$out"
cp build/amd64/kernel/zusestick.img "$out/zusestick.img"
git checkout -q -- capsules/BLOCK_MAP.md v3/include/version.h 2>/dev/null || true # the build regenerates these
git checkout -q -- capsules/BLOCK_MAP.md 2>/dev/null || true # a signed build rewrites it; version.h is untracked (#145)
echo "demo: Zuse minted -- $out/zusestick.img"
+1 -1
View File
@@ -178,7 +178,7 @@ check "a good format reads back" "$MKARTEMIS" --format "$T/t.img" --first-lba 20
rm -f "$T/t.img"
# the builds regenerate these; put them back as committed (as qemu_session.py does)
git checkout -q -- v3/include/version.h capsules/BLOCK_MAP.md sbom.spdx sbom.spdx.json
git checkout -q -- capsules/BLOCK_MAP.md sbom.spdx sbom.spdx.json # version.h is untracked (#145)
echo "RESULT: $([ $ok = 1 ] && echo PASS || echo FAIL)"
[ $ok = 1 ]
+3 -2
View File
@@ -152,8 +152,9 @@ images)
cp "build/boards/$2" "$OUT/$3"
done
# boot_image regenerates these (the source SBOM, and what qemu_session.py also puts back);
# the nightly does not change the tree
git checkout -q -- sbom.spdx sbom.spdx.json capsules/BLOCK_MAP.md v3/include/version.h
# the nightly does not change the tree. v3/include/version.h is untracked since 90c5c140 (#145):
# naming it here made git refuse the whole checkout, and set -e end the stage.
git checkout -q -- sbom.spdx sbom.spdx.json capsules/BLOCK_MAP.md
(cd "$OUT" && rm -f pc-stick.img.xz raspi5.img.xz MilkV.img.xz &&
sha256sum StarshipOS.iso pc-stick.img raspi5.img MilkV.img > SHA256SUMS)
xz -T0 -6 "$OUT/pc-stick.img" "$OUT/raspi5.img" "$OUT/MilkV.img"
+1 -1
View File
@@ -1125,6 +1125,6 @@ else:
print(f"RESULT: {'PASS' if ok else 'FAIL'}", flush=True)
if not globals().get("boot_done"):
shutdown()
for f in ("v3/include/version.h", "capsules/BLOCK_MAP.md"):
for f in ("capsules/BLOCK_MAP.md",): # a signed build rewrites its Signed column; version.h is untracked (#145)
subprocess.run(["git", "checkout", "-q", "--", f], cwd=ROOT)
sys.exit(0 if ok else 2)