From bc06bc2534044efa94112e7a33d0f2a83db782da Mon Sep 17 00:00:00 2001
From: rickpeters <rickpeters@upriser.nl>
Date: Mon, 28 Sep 2026 16:41:22 +0200
Subject: [PATCH] feat: vmisobuild.sh and the steam-machine-iso skill run
 build-calamares-modules.sh

---
 .claude/skills/steam-machine-iso/SKILL.md | 8 ++++++--
 scripts/vmisobuild.sh                     | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.claude/skills/steam-machine-iso/SKILL.md b/.claude/skills/steam-machine-iso/SKILL.md
index 0101169..1e3c574 100644
--- a/.claude/skills/steam-machine-iso/SKILL.md
+++ b/.claude/skills/steam-machine-iso/SKILL.md
@@ -127,11 +127,15 @@ sudo rm -rf build out
 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 \
      -v $PWD:/iso -w /iso docker.io/cachyos/cachyos:latest bash -c \
-     'pacman-key --init && pacman-key --populate && pacman -Syu --noconfirm --needed archiso mkinitcpio-archiso git squashfs-tools grub sudo && ./build-live-modules.sh && { ./buildiso.sh -p desktop -w || ./buildiso.sh -p desktop -c -w; }' \
+     'pacman-key --init && pacman-key --populate && pacman -Syu --noconfirm --needed archiso mkinitcpio-archiso git squashfs-tools grub sudo && ./build-live-modules.sh && ./build-calamares-modules.sh && { ./buildiso.sh -p desktop -w || ./buildiso.sh -p desktop -c -w; }' \
    > $HOME/projects/iso-build.log 2>&1"
 ```
 
-`build-live-modules.sh` builds the power-off fix for the ISO's kernels
+`build-calamares-modules.sh` builds Calamares' `packagechooserq` (the Steamify
+page's module; CachyOS's package leaves it out) from CachyOS's Calamares
+source against the installed `cachyos-calamares-next`, into airootfs, with
+the version it was built for in `built-for` (the prebuilt `.so` is no longer
+committed). `build-live-modules.sh` builds the power-off fix for the ISO's kernels
 (live session; needs the source steamify-prepare.sh puts on the ISO).
 Output: `out/desktop/steamify-cachyos-*.iso` (~3.2 GB, ~10 min). The build ends with
 `chown: missing operand` + `ERROR: An unknown error`: harmless, buildiso.sh
diff --git a/scripts/vmisobuild.sh b/scripts/vmisobuild.sh
index b3288a8..7689f93 100755
--- a/scripts/vmisobuild.sh
+++ b/scripts/vmisobuild.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Build the Steam Machine ISO (steammachine-cachyos-live-iso) in the test VM
-# (directly, no container: build-live-modules.sh with sudo, buildiso.sh as
+# (directly, no container: build-live-modules.sh and build-calamares-modules.sh with sudo, buildiso.sh as
 # the user, it sudos itself),
 # visibly (a Konsole on the VM's desktop follows the log), with the package
 # downloads cached on the host, and copy the ISO back.
@@ -50,7 +50,7 @@ sudo rm -rf build out
 cat > ~/projects/iso-build.sh << S
 #!/bin/bash
 cd $iso
-sudo ./build-live-modules.sh && { ./buildiso.sh -p desktop -w || ./buildiso.sh -p desktop -c -w; }
+sudo ./build-live-modules.sh && sudo ./build-calamares-modules.sh && { ./buildiso.sh -p desktop -w || ./buildiso.sh -p desktop -c -w; }
 echo "== BUILD EXIT \$?"
 ls -la out/desktop/*.iso 2>/dev/null
 S