diff --git a/Justfile b/Justfile index 6706129f..249cd906 100644 --- a/Justfile +++ b/Justfile @@ -338,9 +338,8 @@ generate-bootable-image stream="testing": sync echo "Bootable disk ready: $disk" -# Build a single-architecture UEFI live ISO. This first slice proves the -# Utah live boot path; installer payload integration is intentionally the next -# ISO milestone. +# Build a single-architecture UEFI live ISO, including the offline installer +# and Flatpak payload composed by iso/live/src/install-flatpaks.sh. iso stream="testing" debug="0": #!/usr/bin/env bash set -euo pipefail diff --git a/README.md b/README.md index 1ffae678..2a5acfd0 100644 --- a/README.md +++ b/README.md @@ -66,9 +66,8 @@ verify step asserts *that file*, so the two cannot disagree. This is the honest list, and it is why the label above says pre-alpha. -- **Nothing is published.** No image, no ISO artifact, no installer. A live - ISO builds locally (`just iso`); installer payload integration is the next - ISO milestone. +- **Nothing is published.** No image or ISO artifact is published; a live ISO + with its installer payload builds locally (`just iso`). - **The NVIDIA and gaming flavors are unproven.** The OGC kernel compiles with `sched_ext` and `binderfs` genuinely enabled, and the NVIDIA open module compiles for the base kernel. The module against the OGC kernel, the driver diff --git a/docs/skills/local-testing.md b/docs/skills/local-testing.md index 67755c90..0e083508 100644 --- a/docs/skills/local-testing.md +++ b/docs/skills/local-testing.md @@ -106,12 +106,14 @@ The local OCI ref is not available from the guest's localhost registry, so unified-storage service is skipped instead of retrying its registry repull forever. Published images omit that argument and keep the service enabled. -## Live ISO (initial bring-up) +## Live ISO -The first ISO slice reuses Utah's own kernel, dracut-live, and GNOME image. -`just iso` builds a single-architecture UEFI live ISO; this first slice proves -the Utah live boot path, and installer payload integration is intentionally -the next ISO milestone (comment above `iso` in `Justfile`): +The ISO reuses Utah's own kernel, dracut-live, and GNOME image. `just iso` +builds a single-architecture UEFI live ISO and runs +`iso/live/src/install-flatpaks.sh` while composing it. That script fetches the +version-pinned bootc-installer Flatpak bundle and the declared Flathub apps, so +installer-source changes should be covered by `just check` plus a full +`just iso testing` build when the build environment has network access: ```bash just iso testing @@ -120,12 +122,10 @@ just iso testing 1 # optional live-session SSH diagnostics (debug=1) ``` The result is `output/utah-live.iso`, assembled with systemd-boot, a -`UTAH_LIVE` dmsquash-live root, and a serial `UTAH_LIVE_READY` marker. It is -intended to prove live desktop boot first; bootc-installer/offline payload -integration is the next ISO milestone. `just boot-iso` boots it with -QEMU-for-Docker and exposes the noVNC console at the printed URL (comment -above `boot-iso` in `Justfile`), with TPM, UEFI, and `-snapshot` so nothing -persists. +`UTAH_LIVE` dmsquash-live root, and a serial `UTAH_LIVE_READY` marker. +`just boot-iso` boots it with QEMU-for-Docker and exposes the noVNC console at +the printed URL (comment above `boot-iso` in `Justfile`), with TPM, UEFI, and +`-snapshot` so nothing persists. ## Verification diff --git a/iso/live/src/install-flatpaks.sh b/iso/live/src/install-flatpaks.sh index 01225b0a..9069d674 100644 --- a/iso/live/src/install-flatpaks.sh +++ b/iso/live/src/install-flatpaks.sh @@ -6,6 +6,25 @@ set -euo pipefail FLATPAK_CACHE=/var/cache/flatpak-dl INSTALLER_APP_ID=org.bootcinstaller.Installer +# #50 asks for this to point at tuna-os/bootc-installer. It does not yet, +# and the reason is a VERSIONING change, not a missing artifact: +# +# projectbluefin/bootc-installer semver tags ... v3.0.13 v3.0.14 v3.0.16 +# tuna-os/bootc-installer semver tags ... v3.0.13 v3.0.14, +# then date tags v2026.09.08-2684a1d, ... +# +# The two share tag history through v3.0.14, then tuna-os switched to +# date-based tags. So v3.0.16 exists only here (verified: the flatpak asset +# 200s from projectbluefin and 404s from tuna-os at that tag), while +# tuna-os DOES publish the same org.bootcinstaller.Installer.flatpak asset at +# its date tags (verified 200 at v2026.09.14-9a9a913). +# +# Repointing therefore also means re-pinning onto a different versioning +# scheme, and #48 is open against these same lines proposing the opposite +# direction (stay here, add a sha256 pin). Which org is canonical is the open +# question in #50; whoever answers it should move INSTALLER_REPO and +# INSTALLER_VERSION together, because moving the repo alone breaks the build +# under `curl --fail`. INSTALLER_REPO=projectbluefin/bootc-installer FALLBACK_REPO=tuna-os/tuna-installer BUNDLE=org.bootcinstaller.Installer.flatpak