diff --git a/targets/aarch64-alarm.conf b/targets/aarch64-alarm.conf index e493a16f..708ae24d 100644 --- a/targets/aarch64-alarm.conf +++ b/targets/aarch64-alarm.conf @@ -30,7 +30,7 @@ verify_platform = linux/amd64 # pkgforge-dev/docker-archlinux (archlinuxarm.gpg and its trust), copied out # of it and never run. The x86_64 image keeps its own archlinux keyring. # tag: aarch64 -keyring_image = ghcr.io/pkgforge-dev/archlinux:aarch64@sha256:194f420dc71b54eab7dcfef9c9ca0c0b80f1e0f1f00f08ce33d70f01a572132e +keyring_image = ghcr.io/pkgforge-dev/archlinux:aarch64@sha256:737a533f0133b54d60ef43d81daf7ddcf9f552269b8fbb01c27b9997b3cd654c keyring_platform = linux/arm64 # The keyring package is in core: verify installs it from the promoted diff --git a/targets/aarch64-aur.conf b/targets/aarch64-aur.conf index 3e3d65a5..8cec36e1 100644 --- a/targets/aarch64-aur.conf +++ b/targets/aarch64-aur.conf @@ -30,7 +30,7 @@ verify_platform = linux/amd64 # pkgforge-dev/docker-archlinux (archlinuxarm.gpg and its trust), copied out # of it and never run. The x86_64 image keeps its own archlinux keyring. # tag: aarch64 -keyring_image = ghcr.io/pkgforge-dev/archlinux:aarch64@sha256:194f420dc71b54eab7dcfef9c9ca0c0b80f1e0f1f00f08ce33d70f01a572132e +keyring_image = ghcr.io/pkgforge-dev/archlinux:aarch64@sha256:737a533f0133b54d60ef43d81daf7ddcf9f552269b8fbb01c27b9997b3cd654c keyring_platform = linux/arm64 # The keyring package is in core: verify installs it from the promoted diff --git a/targets/aarch64-core.conf b/targets/aarch64-core.conf index 7868dc2e..c7a692df 100644 --- a/targets/aarch64-core.conf +++ b/targets/aarch64-core.conf @@ -30,7 +30,7 @@ verify_platform = linux/amd64 # pkgforge-dev/docker-archlinux (archlinuxarm.gpg and its trust), copied out # of it and never run. The x86_64 image keeps its own archlinux keyring. # tag: aarch64 -keyring_image = ghcr.io/pkgforge-dev/archlinux:aarch64@sha256:194f420dc71b54eab7dcfef9c9ca0c0b80f1e0f1f00f08ce33d70f01a572132e +keyring_image = ghcr.io/pkgforge-dev/archlinux:aarch64@sha256:737a533f0133b54d60ef43d81daf7ddcf9f552269b8fbb01c27b9997b3cd654c keyring_platform = linux/arm64 # The keyring package, installed from the snapshot before anything else is diff --git a/targets/aarch64-extra.conf b/targets/aarch64-extra.conf index b25d40ea..b08cecc4 100644 --- a/targets/aarch64-extra.conf +++ b/targets/aarch64-extra.conf @@ -34,7 +34,7 @@ verify_platform = linux/amd64 # pkgforge-dev/docker-archlinux (archlinuxarm.gpg and its trust), copied out # of it and never run. The x86_64 image keeps its own archlinux keyring. # tag: aarch64 -keyring_image = ghcr.io/pkgforge-dev/archlinux:aarch64@sha256:194f420dc71b54eab7dcfef9c9ca0c0b80f1e0f1f00f08ce33d70f01a572132e +keyring_image = ghcr.io/pkgforge-dev/archlinux:aarch64@sha256:737a533f0133b54d60ef43d81daf7ddcf9f552269b8fbb01c27b9997b3cd654c keyring_platform = linux/arm64 # The keyring package is in core: verify installs it from the promoted diff --git a/targets/armv7h-alarm.conf b/targets/armv7h-alarm.conf index 9428aa1d..57ad85aa 100644 --- a/targets/armv7h-alarm.conf +++ b/targets/armv7h-alarm.conf @@ -30,7 +30,7 @@ verify_platform = linux/amd64 # pkgforge-dev/docker-archlinux (archlinuxarm.gpg and its trust), copied out # of it and never run. The x86_64 image keeps its own archlinux keyring. # tag: armv7h -keyring_image = ghcr.io/pkgforge-dev/archlinux:armv7h@sha256:ac0a384ef159eb1a1ea986c5410bd32b2497cced3626c41b0a9f241331173611 +keyring_image = ghcr.io/pkgforge-dev/archlinux:armv7h@sha256:a6fa86f18c7a454e8a34711c710adb150be68b7c6f6a9f74494b96177647f328 keyring_platform = linux/arm/v7 # The keyring package is in core: verify installs it from the promoted diff --git a/targets/armv7h-aur.conf b/targets/armv7h-aur.conf index 7489d86f..6306e47e 100644 --- a/targets/armv7h-aur.conf +++ b/targets/armv7h-aur.conf @@ -30,7 +30,7 @@ verify_platform = linux/amd64 # pkgforge-dev/docker-archlinux (archlinuxarm.gpg and its trust), copied out # of it and never run. The x86_64 image keeps its own archlinux keyring. # tag: armv7h -keyring_image = ghcr.io/pkgforge-dev/archlinux:armv7h@sha256:ac0a384ef159eb1a1ea986c5410bd32b2497cced3626c41b0a9f241331173611 +keyring_image = ghcr.io/pkgforge-dev/archlinux:armv7h@sha256:a6fa86f18c7a454e8a34711c710adb150be68b7c6f6a9f74494b96177647f328 keyring_platform = linux/arm/v7 # The keyring package is in core: verify installs it from the promoted diff --git a/targets/armv7h-core.conf b/targets/armv7h-core.conf index ddf00734..bf20fed7 100644 --- a/targets/armv7h-core.conf +++ b/targets/armv7h-core.conf @@ -30,7 +30,7 @@ verify_platform = linux/amd64 # pkgforge-dev/docker-archlinux (archlinuxarm.gpg and its trust), copied out # of it and never run. The x86_64 image keeps its own archlinux keyring. # tag: armv7h -keyring_image = ghcr.io/pkgforge-dev/archlinux:armv7h@sha256:ac0a384ef159eb1a1ea986c5410bd32b2497cced3626c41b0a9f241331173611 +keyring_image = ghcr.io/pkgforge-dev/archlinux:armv7h@sha256:a6fa86f18c7a454e8a34711c710adb150be68b7c6f6a9f74494b96177647f328 keyring_platform = linux/arm/v7 # The keyring package, installed from the snapshot before anything else is diff --git a/targets/armv7h-extra.conf b/targets/armv7h-extra.conf index 2ab519d0..1a8e8627 100644 --- a/targets/armv7h-extra.conf +++ b/targets/armv7h-extra.conf @@ -30,7 +30,7 @@ verify_platform = linux/amd64 # pkgforge-dev/docker-archlinux (archlinuxarm.gpg and its trust), copied out # of it and never run. The x86_64 image keeps its own archlinux keyring. # tag: armv7h -keyring_image = ghcr.io/pkgforge-dev/archlinux:armv7h@sha256:ac0a384ef159eb1a1ea986c5410bd32b2497cced3626c41b0a9f241331173611 +keyring_image = ghcr.io/pkgforge-dev/archlinux:armv7h@sha256:a6fa86f18c7a454e8a34711c710adb150be68b7c6f6a9f74494b96177647f328 keyring_platform = linux/arm/v7 # The keyring package is in core: verify installs it from the promoted diff --git a/targets/loong64-core.conf b/targets/loong64-core.conf index f43dae3d..5790c5c8 100644 --- a/targets/loong64-core.conf +++ b/targets/loong64-core.conf @@ -30,7 +30,7 @@ verify_platform = linux/amd64 # of it and never run. The x86_64 image keeps its own archlinux keyring, which # signs the port's any packages. # tag: loong64 -keyring_image = ghcr.io/pkgforge-dev/archlinux:loong64@sha256:bcc7f2dbb9f8ffd09b5b9094babb7dc8ccb9c042fd5fe14cbda193d156e93869 +keyring_image = ghcr.io/pkgforge-dev/archlinux:loong64@sha256:c700e6783762fdbd10325106fb7651a7fd9188cca1400a13fd4c2e280faf34ae keyring_platform = linux/loong64 # Both keyring packages, installed from the snapshot before anything else is diff --git a/targets/loong64-extra.conf b/targets/loong64-extra.conf index 8f48fab5..59a5ba23 100644 --- a/targets/loong64-extra.conf +++ b/targets/loong64-extra.conf @@ -36,7 +36,7 @@ verify_platform = linux/amd64 # of it and never run. The x86_64 image keeps its own archlinux keyring, which # signs the port's any packages. # tag: loong64 -keyring_image = ghcr.io/pkgforge-dev/archlinux:loong64@sha256:bcc7f2dbb9f8ffd09b5b9094babb7dc8ccb9c042fd5fe14cbda193d156e93869 +keyring_image = ghcr.io/pkgforge-dev/archlinux:loong64@sha256:c700e6783762fdbd10325106fb7651a7fd9188cca1400a13fd4c2e280faf34ae keyring_platform = linux/loong64 # Both keyring packages are in core: verify installs them from the promoted diff --git a/targets/powerpc-base-any.conf b/targets/powerpc-base-any.conf index 661af46c..e7214f42 100644 --- a/targets/powerpc-base-any.conf +++ b/targets/powerpc-base-any.conf @@ -18,7 +18,7 @@ verify_image = docker.io/library/archlinux:base@sha256:d4594bb2300cba11f41c2f279 verify_platform = linux/amd64 # tag: ppc -keyring_image = ghcr.io/pkgforge-dev/archlinux:ppc@sha256:42b5a6db0ce78f1cdfa624c4d64ac719edcdca3830a4a2c58117dd72fad3dc71 +keyring_image = ghcr.io/pkgforge-dev/archlinux:ppc@sha256:8a4ad2abc3089c1d5d18a368fceb9322126756bcfd85436ccaf13bae7f35ac7a keyring_platform = linux/ppc # The keyring package is in this repository, so no keyring_from. diff --git a/targets/powerpc-base.conf b/targets/powerpc-base.conf index 8c79bfbc..141d6c36 100644 --- a/targets/powerpc-base.conf +++ b/targets/powerpc-base.conf @@ -17,7 +17,7 @@ verify_image = docker.io/library/archlinux:base@sha256:d4594bb2300cba11f41c2f279 verify_platform = linux/amd64 # tag: ppc -keyring_image = ghcr.io/pkgforge-dev/archlinux:ppc@sha256:42b5a6db0ce78f1cdfa624c4d64ac719edcdca3830a4a2c58117dd72fad3dc71 +keyring_image = ghcr.io/pkgforge-dev/archlinux:ppc@sha256:8a4ad2abc3089c1d5d18a368fceb9322126756bcfd85436ccaf13bae7f35ac7a keyring_platform = linux/ppc # The keyring package is in base-any. keyring_from names that target of this diff --git a/targets/powerpc64-base-any.conf b/targets/powerpc64-base-any.conf index 944448a6..4f4f487c 100644 --- a/targets/powerpc64-base-any.conf +++ b/targets/powerpc64-base-any.conf @@ -18,7 +18,7 @@ verify_image = docker.io/library/archlinux:base@sha256:d4594bb2300cba11f41c2f279 verify_platform = linux/amd64 # tag: ppc64 -keyring_image = ghcr.io/pkgforge-dev/archlinux:ppc64@sha256:daa98d5aa8d4836e691248206668f2161da1c701236dd55aa91daa1e3472997d +keyring_image = ghcr.io/pkgforge-dev/archlinux:ppc64@sha256:84623d124e78f0c4d3c371d2916737074817d495178ecafccbf3fbddcfef58b7 keyring_platform = linux/ppc64 # The keyring package is in this repository, so no keyring_from. diff --git a/targets/powerpc64-base.conf b/targets/powerpc64-base.conf index 856c793c..51b07110 100644 --- a/targets/powerpc64-base.conf +++ b/targets/powerpc64-base.conf @@ -17,7 +17,7 @@ verify_image = docker.io/library/archlinux:base@sha256:d4594bb2300cba11f41c2f279 verify_platform = linux/amd64 # tag: ppc64 -keyring_image = ghcr.io/pkgforge-dev/archlinux:ppc64@sha256:daa98d5aa8d4836e691248206668f2161da1c701236dd55aa91daa1e3472997d +keyring_image = ghcr.io/pkgforge-dev/archlinux:ppc64@sha256:84623d124e78f0c4d3c371d2916737074817d495178ecafccbf3fbddcfef58b7 keyring_platform = linux/ppc64 # The keyring package is in base-any. keyring_from names that target of this diff --git a/targets/powerpc64le-base-any.conf b/targets/powerpc64le-base-any.conf index 3ea5331f..5591f00f 100644 --- a/targets/powerpc64le-base-any.conf +++ b/targets/powerpc64le-base-any.conf @@ -18,7 +18,7 @@ verify_image = docker.io/library/archlinux:base@sha256:d4594bb2300cba11f41c2f279 verify_platform = linux/amd64 # tag: ppc64le -keyring_image = ghcr.io/pkgforge-dev/archlinux:ppc64le@sha256:2d0ec20c48ae3c234ddc85bf3d6b4eba85df02e504d4d7316a27c96906f50294 +keyring_image = ghcr.io/pkgforge-dev/archlinux:ppc64le@sha256:58aa73258f7fc51c443ab7eb7457890fa997d913a767af77377b76e2ff7d40b1 keyring_platform = linux/ppc64le # The keyring package is in this repository, so no keyring_from. diff --git a/targets/powerpc64le-base.conf b/targets/powerpc64le-base.conf index d27f29f5..1f53d2d6 100644 --- a/targets/powerpc64le-base.conf +++ b/targets/powerpc64le-base.conf @@ -17,7 +17,7 @@ verify_image = docker.io/library/archlinux:base@sha256:d4594bb2300cba11f41c2f279 verify_platform = linux/amd64 # tag: ppc64le -keyring_image = ghcr.io/pkgforge-dev/archlinux:ppc64le@sha256:2d0ec20c48ae3c234ddc85bf3d6b4eba85df02e504d4d7316a27c96906f50294 +keyring_image = ghcr.io/pkgforge-dev/archlinux:ppc64le@sha256:58aa73258f7fc51c443ab7eb7457890fa997d913a767af77377b76e2ff7d40b1 keyring_platform = linux/ppc64le # The keyring package is in base-any. keyring_from names that target of this diff --git a/targets/riscv64-core.conf b/targets/riscv64-core.conf index 0a936b1c..6529cbca 100644 --- a/targets/riscv64-core.conf +++ b/targets/riscv64-core.conf @@ -35,7 +35,7 @@ verify_platform = linux/amd64 # signature in the port is by a key in archlinux.gpg (2026-10-14), which the # x86_64 image keeps as its own; the image follows the port if that changes. # tag: riscv64 -keyring_image = ghcr.io/pkgforge-dev/archlinux:riscv64@sha256:31265fd851849c15b52fde968566f9e10a076ac22a696f651a9af242753680ec +keyring_image = ghcr.io/pkgforge-dev/archlinux:riscv64@sha256:add3c62e45a9787d11fe6fb6a144a67a79f9c4513aaeec50a60f337f4b705b1d keyring_platform = linux/riscv64 # The keyring package, installed from the snapshot before anything else is diff --git a/targets/riscv64-extra.conf b/targets/riscv64-extra.conf index 1116dda5..a4781225 100644 --- a/targets/riscv64-extra.conf +++ b/targets/riscv64-extra.conf @@ -40,7 +40,7 @@ verify_platform = linux/amd64 # signature in the port is by a key in archlinux.gpg (2026-10-14), which the # x86_64 image keeps as its own; the image follows the port if that changes. # tag: riscv64 -keyring_image = ghcr.io/pkgforge-dev/archlinux:riscv64@sha256:31265fd851849c15b52fde968566f9e10a076ac22a696f651a9af242753680ec +keyring_image = ghcr.io/pkgforge-dev/archlinux:riscv64@sha256:add3c62e45a9787d11fe6fb6a144a67a79f9c4513aaeec50a60f337f4b705b1d keyring_platform = linux/riscv64 # The keyring package is in core: verify installs it from the promoted diff --git a/tests/unit/40-lib.sh b/tests/unit/40-lib.sh index 497e644f..3602a794 100644 --- a/tests/unit/40-lib.sh +++ b/tests/unit/40-lib.sh @@ -72,7 +72,7 @@ refused "a line that is not key = value" "$work/t6/x86_64-core.conf" # The keys that set verify's trust root #---------------------------------------------------------------------------# # tag: aarch64 -IMG='ghcr.io/pkgforge-dev/archlinux:aarch64@sha256:194f420dc71b54eab7dcfef9c9ca0c0b80f1e0f1f00f08ce33d70f01a572132e' +IMG='ghcr.io/pkgforge-dev/archlinux:aarch64@sha256:737a533f0133b54d60ef43d81daf7ddcf9f552269b8fbb01c27b9997b3cd654c' # trust NAME LINES...: a target file of x86_64 extra, with x86_64-core beside it trust() { local d="$work/trust-$1"