ISO: flip [breadway] to the signed dl.breadway.dev/arch repo
The signed repo is live: https://dl.breadway.dev/arch/x86_64/ serves breadway.db + .files + every .pkg.tar.zst with a detached .sig from the BOS release key (56203B86A110695AE7F310934AF3323D678EB5E2 = KEYS.asc), rebuilt from the Forgejo Arch registry by signed-repo.yml + scripts/ci-publish-signed-repo.sh. Verified: db/pkg sigs all GPG-good against KEYS.asc. Executes the "After the signed repo exists" plan in docs/signed-repo.md: - `iso/pacman.conf` + `iso/airootfs/etc/pacman.conf`: section renamed `[Breadway.os.git.breadway.dev]` → `[breadway]` (matches breadway.db), `Server = https://dl.breadway.dev/arch/$arch`, `SigLevel = Required`. The old "Forgejo has no db sigs / KEYS.asc is not a repo key / do NOT flip" comments are gone — both are now false. - `iso/airootfs/etc/pacman.d/breadway-repo.asc`: the public key, baked into the image. - `build-local.sh`: trust the key in the build host's pacman keyring before mkarchiso (so pacstrap can verify [breadway] while assembling the airootfs); drop the now-obsolete Forgejo-registry URL rewrite. - `iso/airootfs/root/customize_airootfs.sh` (new): trust the key in the image keyring so the live medium — and, via calamares unpackfs, the installed target — verify [breadway]. (archiso warns this hook is deprecated; there is no replacement for "add a repo key to the image keyring" and BOS ships no pacman-init.service.) - `calamares/post-install.sh`: `pacman-key --add` + `--lsign-key` the BOS key in the target chroot as a fallback (unpackfs can skip /etc/pacman.d/gnupg). - README.md / DESIGN.md / docs/signed-repo.md updated. NOT yet done: build the ISO (`sudo ./build-local.sh`) and VM-verify `pacman -Sy` + a `[breadway]` install with no signature prompt, on both the live medium and a fresh install. The build-time keyring path (pacstrap -G vs host keyring vs customize_airootfs) may need a tweak once the real build runs.
This commit is contained in:
parent
b38bbbac1a
commit
98cfe9d60b
9 changed files with 137 additions and 67 deletions
|
|
@ -25,14 +25,19 @@ OUT="${OUT:-$REPO/out}"
|
|||
STAGE=/tmp/bos-iso-stage
|
||||
rm -rf "$STAGE" && cp -a "$REPO/iso" "$STAGE"
|
||||
|
||||
# Rewrite the [breadway] pacman repo URL to the fastest reachable address.
|
||||
# CI_BUILD=1 — container runs on hestia with --network=host; localhost:3002 is direct
|
||||
# default — building on hermes; git.breadway.dev is flaky from there, use Tailscale
|
||||
# Only ever rewrites the staged copy, never the committed pacman.conf.
|
||||
if [ "${CI_BUILD:-0}" = "1" ]; then
|
||||
sed -i 's#https://git.breadway.dev/api/packages/Breadway/arch/os#http://localhost:3002/api/packages/Breadway/arch/os#' "$STAGE/pacman.conf"
|
||||
else
|
||||
sed -i 's#https://git.breadway.dev/api/packages/Breadway/arch/os#http://100.66.238.26:3002/api/packages/Breadway/arch/os#' "$STAGE/pacman.conf"
|
||||
# [breadway] now points at the signed public repo https://dl.breadway.dev/arch
|
||||
# (SigLevel = Required) — no Forgejo-registry URL rewrite needed anymore.
|
||||
#
|
||||
# Trust the [breadway] repo key in *this* build host's pacman keyring so
|
||||
# `pacstrap` can verify [breadway] packages while assembling the airootfs.
|
||||
# The same key is baked into the image at etc/pacman.d/breadway-repo.asc and
|
||||
# re-trusted on the live medium / installed target (calamares/post-install.sh).
|
||||
BREADWAY_KEY_FPR="56203B86A110695AE7F310934AF3323D678EB5E2"
|
||||
BREADWAY_KEY_SRC="$REPO/iso/airootfs/etc/pacman.d/breadway-repo.asc"
|
||||
if ! pacman-key --list-keys "$BREADWAY_KEY_FPR" &>/dev/null; then
|
||||
echo "=== trusting [breadway] repo key ($BREADWAY_KEY_FPR) in the host pacman keyring ==="
|
||||
pacman-key --add "$BREADWAY_KEY_SRC"
|
||||
pacman-key --lsign-key "$BREADWAY_KEY_FPR"
|
||||
fi
|
||||
|
||||
if [ "${FAST_BUILD:-0}" = "1" ]; then
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue