diff --git a/distro/camel.toml b/distro/camel.toml index 0e687bf..4e8c503 100644 --- a/distro/camel.toml +++ b/distro/camel.toml @@ -144,6 +144,11 @@ name = "waypaper" reason = "wallpaper setter (niri autostart: waypaper --restore)" status = "in [tanin]" +[[packages.rebuilt_aur]] +name = "calamares" +reason = "GUI installer for the ISO — AUR-only, not in official repos" +status = "TODO — heavy Qt build; rebuild into [tanin] (finish-tanin-repo.sh / BUILD.md one-liner)" + [[packages.rebuilt_aur]] name = "paru (or paru-bin)" reason = "AUR helper — wanted preinstalled on the ISO; must be in [tanin] first" diff --git a/iso/BUILD.md b/iso/BUILD.md index 6412eb0..3326218 100644 --- a/iso/BUILD.md +++ b/iso/BUILD.md @@ -26,6 +26,19 @@ sudo pacman -S archiso # to build `overrides/packages.x86_64` (currently commented out), or the build fails. (Rebuild like eww-git: `paru-bin` via makepkg → `publish-tanin-repo.sh`.) +## First: put calamares (and the other AUR rebuilds) into [tanin] +`calamares` is AUR-only, so mkarchiso can't pull it from the official repos — it +must live in `[tanin]`. Heavy Qt build (installs makedepends via sudo): +```sh +cd /tmp && rm -rf calamares && git clone https://aur.archlinux.org/calamares.git +cd calamares && makepkg -sf --noconfirm +cp ./*.pkg.tar.zst ~/projects/tanin-repo/ +# publish (create a write:package token in Gitea → Settings → Applications): +TANIN_PKG_TOKEN= ~/projects/taninux/packaging/publish-tanin-repo.sh +``` +(If the AUR `calamares` lags a Qt bump, try `calamares-git`, or fall back to +`archinstall` — already in the live base.) + ## Build ```sh ./bootstrap-profile.sh # assemble build-profile/ (releng base + overrides) diff --git a/iso/overrides/packages.x86_64 b/iso/overrides/packages.x86_64 index 7e59427..ea9b320 100644 --- a/iso/overrides/packages.x86_64 +++ b/iso/overrides/packages.x86_64 @@ -19,10 +19,10 @@ snap-pac # boot splash plymouth -# live installer host (cage). calamares is AUR -> rebuild into [tanin] first, -# then uncomment (see BUILD.md). archinstall (TUI) is already in the releng base. +# live installer: cage hosts calamares. calamares is AUR -> served from [tanin] +# (rebuild via finish-tanin-repo.sh / the calamares one-liner in BUILD.md). cage -#calamares +calamares # target bootloader efibootmgr diff --git a/packaging/build-tanin-repo.sh b/packaging/build-tanin-repo.sh index a7561d9..8bc2876 100755 --- a/packaging/build-tanin-repo.sh +++ b/packaging/build-tanin-repo.sh @@ -17,7 +17,7 @@ mkdir -p "$OUT" OWN_SIMPLE=(tanin-greet tanin-libadwaita tanin-setup tanin-eww tanin-desktop) OWN_BUILD=(taninux) -AUR_REBUILD=(eww-git tiramisu-git waypaper) +AUR_REBUILD=(eww-git tiramisu-git waypaper calamares) build() { local p="$1" diff --git a/packaging/finish-tanin-repo.sh b/packaging/finish-tanin-repo.sh index dad8974..c50c815 100755 --- a/packaging/finish-tanin-repo.sh +++ b/packaging/finish-tanin-repo.sh @@ -16,9 +16,9 @@ sudo pacman -S --needed --noconfirm python-build python-installer python-hatchli ( cd "$HERE/taninux" && makepkg -sf --noconfirm ) \ && cp "$HERE/taninux/"*.pkg.tar.zst "$OUT/" && echo " ok" || echo " FAILED (taninux)" -echo "==> AUR rebuilds: eww-git tiramisu-git waypaper" +echo "==> AUR rebuilds: eww-git tiramisu-git waypaper calamares" tmp="$(mktemp -d)" -for p in eww-git tiramisu-git waypaper; do +for p in eww-git tiramisu-git waypaper calamares; do echo " -- $p" if git clone --depth=1 "https://aur.archlinux.org/$p.git" "$tmp/$p" >/dev/null 2>&1 \ && ( cd "$tmp/$p" && makepkg -sf --noconfirm ); then