diff --git a/targets/aarch64-alarm.conf b/targets/aarch64-alarm.conf index 2b118a39..b587ff7f 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:3fe5966dab8a8d871b787a1fc8e1f4f130953ab3513d8cb5648e09af4ac24b97 +keyring_image = ghcr.io/pkgforge-dev/archlinux:aarch64@sha256:3635edfb1224cf14e08249060e216735b766373037cca0265d0da47dffeead0c 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 138d1117..c07998ae 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:3fe5966dab8a8d871b787a1fc8e1f4f130953ab3513d8cb5648e09af4ac24b97 +keyring_image = ghcr.io/pkgforge-dev/archlinux:aarch64@sha256:3635edfb1224cf14e08249060e216735b766373037cca0265d0da47dffeead0c 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 fe12ad86..89b87b28 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:3fe5966dab8a8d871b787a1fc8e1f4f130953ab3513d8cb5648e09af4ac24b97 +keyring_image = ghcr.io/pkgforge-dev/archlinux:aarch64@sha256:3635edfb1224cf14e08249060e216735b766373037cca0265d0da47dffeead0c 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 0d9af5a9..e8714c40 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:3fe5966dab8a8d871b787a1fc8e1f4f130953ab3513d8cb5648e09af4ac24b97 +keyring_image = ghcr.io/pkgforge-dev/archlinux:aarch64@sha256:3635edfb1224cf14e08249060e216735b766373037cca0265d0da47dffeead0c 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 f57b190f..01e09d2c 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:da0608f02b837fb11b4d1ebef1d9512194575c5372bec629d98a35ee4cc66e95 +keyring_image = ghcr.io/pkgforge-dev/archlinux:armv7h@sha256:8e9f6fc577a782a665d18ad8e5a62e3e733658b81ea8cf6dfb2ef540c1a92128 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 d8ab08ae..e6793c2d 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:da0608f02b837fb11b4d1ebef1d9512194575c5372bec629d98a35ee4cc66e95 +keyring_image = ghcr.io/pkgforge-dev/archlinux:armv7h@sha256:8e9f6fc577a782a665d18ad8e5a62e3e733658b81ea8cf6dfb2ef540c1a92128 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 bffc0436..9e9772c9 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:da0608f02b837fb11b4d1ebef1d9512194575c5372bec629d98a35ee4cc66e95 +keyring_image = ghcr.io/pkgforge-dev/archlinux:armv7h@sha256:8e9f6fc577a782a665d18ad8e5a62e3e733658b81ea8cf6dfb2ef540c1a92128 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 00b3d2e7..21bd44d0 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:da0608f02b837fb11b4d1ebef1d9512194575c5372bec629d98a35ee4cc66e95 +keyring_image = ghcr.io/pkgforge-dev/archlinux:armv7h@sha256:8e9f6fc577a782a665d18ad8e5a62e3e733658b81ea8cf6dfb2ef540c1a92128 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 327dbb89..1fa0a587 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:024cfe2805df5a9360da4303abd638cfa5f2aeffd6928df024772bf4a8f6fc10 +keyring_image = ghcr.io/pkgforge-dev/archlinux:loong64@sha256:094408fa74850052aa31e1e6dbb458ffedf2e3c115910c394b89fc4eb6a4abfa 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 a6bc83ef..5002474c 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:024cfe2805df5a9360da4303abd638cfa5f2aeffd6928df024772bf4a8f6fc10 +keyring_image = ghcr.io/pkgforge-dev/archlinux:loong64@sha256:094408fa74850052aa31e1e6dbb458ffedf2e3c115910c394b89fc4eb6a4abfa 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 171cd83a..7c1377d3 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:52dfbd5afb23a220d5ee92daf verify_platform = linux/amd64 # tag: ppc -keyring_image = ghcr.io/pkgforge-dev/archlinux:ppc@sha256:b129ed4a35b83f4eb65d7ba7236bae93bdc6b6e474b4699207f75cdd3af76347 +keyring_image = ghcr.io/pkgforge-dev/archlinux:ppc@sha256:fa7a82012c661c343acd9a8463024878dc1af1e33e8955b6fb6c1a0f8bd7a12f 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 12c0b72b..1038c7c8 100644 --- a/targets/powerpc-base.conf +++ b/targets/powerpc-base.conf @@ -17,7 +17,7 @@ verify_image = docker.io/library/archlinux:base@sha256:52dfbd5afb23a220d5ee92daf verify_platform = linux/amd64 # tag: ppc -keyring_image = ghcr.io/pkgforge-dev/archlinux:ppc@sha256:b129ed4a35b83f4eb65d7ba7236bae93bdc6b6e474b4699207f75cdd3af76347 +keyring_image = ghcr.io/pkgforge-dev/archlinux:ppc@sha256:fa7a82012c661c343acd9a8463024878dc1af1e33e8955b6fb6c1a0f8bd7a12f 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 82dfc046..2f4fd322 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:52dfbd5afb23a220d5ee92daf verify_platform = linux/amd64 # tag: ppc64 -keyring_image = ghcr.io/pkgforge-dev/archlinux:ppc64@sha256:0b53faea5c378d64d9effdb76b2ccec0d630e12837aa2001cef16936a88108aa +keyring_image = ghcr.io/pkgforge-dev/archlinux:ppc64@sha256:9eb0aea71512af4e32c30bc59a4060f5632c9796d70e5e4c2173bbdab4876fae 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 c2d4d799..43af59f0 100644 --- a/targets/powerpc64-base.conf +++ b/targets/powerpc64-base.conf @@ -17,7 +17,7 @@ verify_image = docker.io/library/archlinux:base@sha256:52dfbd5afb23a220d5ee92daf verify_platform = linux/amd64 # tag: ppc64 -keyring_image = ghcr.io/pkgforge-dev/archlinux:ppc64@sha256:0b53faea5c378d64d9effdb76b2ccec0d630e12837aa2001cef16936a88108aa +keyring_image = ghcr.io/pkgforge-dev/archlinux:ppc64@sha256:9eb0aea71512af4e32c30bc59a4060f5632c9796d70e5e4c2173bbdab4876fae 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 4494429e..c2c51405 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:52dfbd5afb23a220d5ee92daf verify_platform = linux/amd64 # tag: ppc64le -keyring_image = ghcr.io/pkgforge-dev/archlinux:ppc64le@sha256:bd1728e793d978b2783a0ebfa2c12e1ad9638e57791154f8657a5d2b2ca69a55 +keyring_image = ghcr.io/pkgforge-dev/archlinux:ppc64le@sha256:7720faad68b889604ecdd02502a0a527e83433e7bdf687df5fb49e416dec9186 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 c49fd232..8b6d9e72 100644 --- a/targets/powerpc64le-base.conf +++ b/targets/powerpc64le-base.conf @@ -17,7 +17,7 @@ verify_image = docker.io/library/archlinux:base@sha256:52dfbd5afb23a220d5ee92daf verify_platform = linux/amd64 # tag: ppc64le -keyring_image = ghcr.io/pkgforge-dev/archlinux:ppc64le@sha256:bd1728e793d978b2783a0ebfa2c12e1ad9638e57791154f8657a5d2b2ca69a55 +keyring_image = ghcr.io/pkgforge-dev/archlinux:ppc64le@sha256:7720faad68b889604ecdd02502a0a527e83433e7bdf687df5fb49e416dec9186 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 82956eb9..12e42cec 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:a31f3b1fbf2ea01999075ae1691c890a2291499594dc124a00883e728e5536f7 +keyring_image = ghcr.io/pkgforge-dev/archlinux:riscv64@sha256:1ada61d6da1e750df3b296e771dc2767d180cb41cd20fc57dfb556510a6d6f73 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 7f2067af..71b0838e 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:a31f3b1fbf2ea01999075ae1691c890a2291499594dc124a00883e728e5536f7 +keyring_image = ghcr.io/pkgforge-dev/archlinux:riscv64@sha256:1ada61d6da1e750df3b296e771dc2767d180cb41cd20fc57dfb556510a6d6f73 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 807558c9..c5b1e4b4 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:3fe5966dab8a8d871b787a1fc8e1f4f130953ab3513d8cb5648e09af4ac24b97' +IMG='ghcr.io/pkgforge-dev/archlinux:aarch64@sha256:3635edfb1224cf14e08249060e216735b766373037cca0265d0da47dffeead0c' # trust NAME LINES...: a target file of x86_64 extra, with x86_64-core beside it trust() { local d="$work/trust-$1"