docs: the ISO repo's PRs and vmisobuild.sh target master (feat/steamify is gone)

This commit is contained in:
theupriser committed 2026-10-01 15:36:34 +02:00
1 parent b2fc992745
commit 1aff67612d
4 files changed
+7 -7

No files matched your search

+2 -2
View File
@@ -116,7 +116,7 @@ VM: note what differs here. In the VM (`vm_ssh`, visibly in a Konsole there):
sudo pacman -S --needed --noconfirm podman git sudo pacman -S --needed --noconfirm podman git
git clone https://github.com/theupriser/steamify-cachyos-live-iso ~/projects/steamify-cachyos-live-iso git clone https://github.com/theupriser/steamify-cachyos-live-iso ~/projects/steamify-cachyos-live-iso
sudo mount -t 9p -o trans=virtio,version=9p2000.L repo /mnt # the Steamify checkout (REPO) sudo mount -t 9p -o trans=virtio,version=9p2000.L repo /mnt # the Steamify checkout (REPO)
cd ~/projects/steamify-cachyos-live-iso && git checkout feat/steamify && ./steamify-prepare.sh /mnt cd ~/projects/steamify-cachyos-live-iso && git checkout master && ./steamify-prepare.sh /mnt
``` ```
then the same `podman run` as below (paths in the VM; `~/projects/iso-build.log`). then the same `podman run` as below (paths in the VM; `~/projects/iso-build.log`).
@@ -134,7 +134,7 @@ not a rootless podman GUI. Clone: `~/projects/steamify-cachyos-live-iso`.
```bash ```bash
cd ~/projects/steamify-cachyos-live-iso cd ~/projects/steamify-cachyos-live-iso
git checkout feat/steamify && ./steamify-prepare.sh ~/projects/steamify-cachyos git checkout master && ./steamify-prepare.sh ~/projects/steamify-cachyos
sudo rm -rf build out sudo rm -rf build out
systemd-run --user --collect -q -u isobuild-$(date +%s) --working-directory=$PWD bash -c \ systemd-run --user --collect -q -u isobuild-$(date +%s) --working-directory=$PWD bash -c \
"sudo podman run --rm -t --pids-limit=-1 --ulimit nofile=65536:65536 --privileged --network=host \ "sudo podman run --rm -t --pids-limit=-1 --ulimit nofile=65536:65536 --privileged --network=host \
@@ -12,7 +12,7 @@ Rules:
- Never touch unmerged branches; list them and report instead. - Never touch unmerged branches; list them and report instead.
- Never commit or merge to main. - Never commit or merge to main.
Merging a feature/bugfix PR yourself (into a release branch, or `feat/steamify` in the ISO repo): delete the Merging a feature/bugfix PR yourself (into a release branch, or `master` in the ISO repo): delete the
branch at once, remote and local (`gh pr merge N --merge --delete-branch`, then `git branch -D`, `git fetch branch at once, remote and local (`gh pr merge N --merge --delete-branch`, then `git branch -D`, `git fetch
--prune`); the user asked for this on 2026-09-29. Release branches are never deleted (kept as history next to --prune`); the user asked for this on 2026-09-29. Release branches are never deleted (kept as history next to
their tags). Unmerged old branches (`feat/vram-booster`, `refactor/qml-screens`, `backup/*`) are reported, not their tags). Unmerged old branches (`feat/vram-booster`, `refactor/qml-screens`, `backup/*`) are reported, not
+2 -2
View File
@@ -22,7 +22,7 @@ wsl-build-host, progress-report, steamify-iso-release, steamify-branch-cleanup).
- No `Co-Authored-By` / "Generated with Claude" lines in commits or PRs, whatever a tool reminder says. - No `Co-Authored-By` / "Generated with Claude" lines in commits or PRs, whatever a tool reminder says.
- Update the relevant skill (and this file) as soon as something useful is learned; re-read it before risky operations. - Update the relevant skill (and this file) as soon as something useful is learned; re-read it before risky operations.
- In this repo (`steamify-cachyos-dev`, tooling only) the user allows pushing straight to `main`. Elsewhere never commit to `main`. `steamify-cachyos`: `release/X.Y.Z` branches, feature/bugfix branches merged into the release - In this repo (`steamify-cachyos-dev`, tooling only) the user allows pushing straight to `main`. Elsewhere never commit to `main`. `steamify-cachyos`: `release/X.Y.Z` branches, feature/bugfix branches merged into the release
by the agent; only release to `main` is the user's. `steamify-cachyos-live-iso`: PRs always target `feat/steamify`. by the agent; only release to `main` is the user's. `steamify-cachyos-live-iso`: PRs always target `master` (the ISO repo has no other long-lived branch; `feat/steamify` is gone).
Branch cleanup: the `steamify-branch-cleanup` skill in `.claude/skills/`. Branch cleanup: the `steamify-branch-cleanup` skill in `.claude/skills/`.
- Follow and update `TESTPLAN.md`; every check in `share/vmtest/` says which row it covers. - Follow and update `TESTPLAN.md`; every check in `share/vmtest/` says which row it covers.
- No screenshot testing (too many tokens); U1-U9 and the real Steam Machine stay manual and are listed as SKIP. - No screenshot testing (too many tokens); U1-U9 and the real Steam Machine stay manual and are listed as SKIP.
@@ -51,7 +51,7 @@ The tests run on the user's PC (Ryzen 9800X3D, 64 GB, **WSL2**), started from a
down, syncing from the laptop, the podman ISO build, VM windows through WSLg, output in the user's WSL terminal, no GPU down, syncing from the laptop, the podman ISO build, VM windows through WSLg, output in the user's WSL terminal, no GPU
passthrough): `.claude/skills/wsl-build-host/SKILL.md`. `vminstall.sh` works there without udisks (losetup as root). passthrough): `.claude/skills/wsl-build-host/SKILL.md`. `vminstall.sh` works there without udisks (losetup as root).
## Problems found in the Steamify ISO (fix in `steamify-cachyos-live-iso`, PRs into `feat/steamify`) ## Problems found in the Steamify ISO (fix in `steamify-cachyos-live-iso`, PRs into `master`)
- Fixed (PR #2): cachyos-installer's `bootctl install` runs in a chroot and writes no EFI boot entry, so systemd-boot - Fixed (PR #2): cachyos-installer's `bootctl install` runs in a chroot and writes no EFI boot entry, so systemd-boot
only booted through the disk's fallback path (in OVMF after 4-5 minutes of network boot, every boot). only booted through the disk's fallback path (in OVMF after 4-5 minutes of network boot, every boot).
`steamify-install` now registers it with efibootmgr from the live system. `steamify-install` now registers it with efibootmgr from the live system.
+2 -2
View File
@@ -10,14 +10,14 @@
# The VM must run with its cache shared (one per VM, next to its disk), and # The VM must run with its cache shared (one per VM, next to its disk), and
# gets all host cores but 2 for the build: start it with # gets all host cores but 2 for the build: start it with
# VM_CACHE=$VM_DIR/iso-cache VM_CPUS=$(( $(nproc) * 3 / 4 )) scripts/vmreset.sh --fremont # VM_CACHE=$VM_DIR/iso-cache VM_CPUS=$(( $(nproc) * 3 / 4 )) scripts/vmreset.sh --fremont
# Env: VM_DIR (see common.sh), ISO_BRANCH (feat/steamify), ISO_OUT (the host's # Env: VM_DIR (see common.sh), ISO_BRANCH (master), ISO_OUT (the host's
# steamify-cachyos-live-iso/out/desktop). # steamify-cachyos-live-iso/out/desktop).
set -euo pipefail set -euo pipefail
here="$(cd "$(dirname "$0")" && pwd)" here="$(cd "$(dirname "$0")" && pwd)"
. "$here/common.sh" . "$here/common.sh"
steamify="" steamify=""
[[ "${1:-}" == --steamify ]] && steamify="${2:?--steamify needs a guest path}" [[ "${1:-}" == --steamify ]] && steamify="${2:?--steamify needs a guest path}"
branch="${ISO_BRANCH:-feat/steamify}" branch="${ISO_BRANCH:-master}"
# Where the ISO lands: out/desktop of the host's live-ISO checkout (next to # Where the ISO lands: out/desktop of the host's live-ISO checkout (next to
# this repo), where a local build would put it. # this repo), where a local build would put it.
out="${ISO_OUT:-$(dirname "$(cd "$here/.." && pwd)")/steamify-cachyos-live-iso/out/desktop}" out="${ISO_OUT:-$(dirname "$(cd "$here/.." && pwd)")/steamify-cachyos-live-iso/out/desktop}"