diff --git a/targets/aarch64-alarm.conf b/targets/aarch64-alarm.conf index 999e714c..46dfb93b 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:dd89780d86c0941d612b5aa6203c5e6c446db7b6d98130b7556c98c5c6dcff06 +keyring_image = ghcr.io/pkgforge-dev/archlinux:aarch64@sha256:0084c063c5c595e32e534aae451225c5a6a1bb5c605f9538dd4307df89fa240b 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 93532876..d4ecb03e 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:dd89780d86c0941d612b5aa6203c5e6c446db7b6d98130b7556c98c5c6dcff06 +keyring_image = ghcr.io/pkgforge-dev/archlinux:aarch64@sha256:0084c063c5c595e32e534aae451225c5a6a1bb5c605f9538dd4307df89fa240b 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 a701e618..afb307f1 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:dd89780d86c0941d612b5aa6203c5e6c446db7b6d98130b7556c98c5c6dcff06 +keyring_image = ghcr.io/pkgforge-dev/archlinux:aarch64@sha256:0084c063c5c595e32e534aae451225c5a6a1bb5c605f9538dd4307df89fa240b 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 7d94cdb8..3ed61cfe 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:dd89780d86c0941d612b5aa6203c5e6c446db7b6d98130b7556c98c5c6dcff06 +keyring_image = ghcr.io/pkgforge-dev/archlinux:aarch64@sha256:0084c063c5c595e32e534aae451225c5a6a1bb5c605f9538dd4307df89fa240b 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 ecc168d2..a96444fc 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:3dbca93d4aade0f139d1c53a9003d50a11d285bdf7d636c52cf432d17faba527 +keyring_image = ghcr.io/pkgforge-dev/archlinux:armv7h@sha256:bdb769f3772ac154401f241cac9cab90a36ebea9e2c181cda4d48eeed4aa3253 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 76cca4b6..44fe5829 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:3dbca93d4aade0f139d1c53a9003d50a11d285bdf7d636c52cf432d17faba527 +keyring_image = ghcr.io/pkgforge-dev/archlinux:armv7h@sha256:bdb769f3772ac154401f241cac9cab90a36ebea9e2c181cda4d48eeed4aa3253 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 3fca69a2..8b176172 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:3dbca93d4aade0f139d1c53a9003d50a11d285bdf7d636c52cf432d17faba527 +keyring_image = ghcr.io/pkgforge-dev/archlinux:armv7h@sha256:bdb769f3772ac154401f241cac9cab90a36ebea9e2c181cda4d48eeed4aa3253 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 24aced62..37a29461 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:3dbca93d4aade0f139d1c53a9003d50a11d285bdf7d636c52cf432d17faba527 +keyring_image = ghcr.io/pkgforge-dev/archlinux:armv7h@sha256:bdb769f3772ac154401f241cac9cab90a36ebea9e2c181cda4d48eeed4aa3253 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 2c005b9f..b45d7f88 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:8e67c61a58041611d0ec5c468b543ca6189ce7613f29357a283aa753e8a5678e +keyring_image = ghcr.io/pkgforge-dev/archlinux:loong64@sha256:522df6fba7aeb5aba5023d66cfa826115078b34a2c9f358d8ad4ef18dec0f3a6 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 072dea7b..058956e4 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:8e67c61a58041611d0ec5c468b543ca6189ce7613f29357a283aa753e8a5678e +keyring_image = ghcr.io/pkgforge-dev/archlinux:loong64@sha256:522df6fba7aeb5aba5023d66cfa826115078b34a2c9f358d8ad4ef18dec0f3a6 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 10733a48..476f2bc9 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:2909bce3b506beaefed99cbd022787430a40d4448e654cfefbf60a124d16fc2e +keyring_image = ghcr.io/pkgforge-dev/archlinux:ppc@sha256:d3bd9d587c1b257d7a639297e34533468fa88f73d84b156cf7a83a447eaaf077 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 f6f87012..67d0459e 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:2909bce3b506beaefed99cbd022787430a40d4448e654cfefbf60a124d16fc2e +keyring_image = ghcr.io/pkgforge-dev/archlinux:ppc@sha256:d3bd9d587c1b257d7a639297e34533468fa88f73d84b156cf7a83a447eaaf077 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 37449ea6..f1e5c0cf 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:602270cfa46816f69d7ce657f447e951450dd96e106878a6e0d132b99fcd6b61 +keyring_image = ghcr.io/pkgforge-dev/archlinux:ppc64@sha256:9fa58eae6ee6e1afa370b72108c3721ebe7213915e4babf53bd23324ea15148a 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 d84938e8..ce0003c8 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:602270cfa46816f69d7ce657f447e951450dd96e106878a6e0d132b99fcd6b61 +keyring_image = ghcr.io/pkgforge-dev/archlinux:ppc64@sha256:9fa58eae6ee6e1afa370b72108c3721ebe7213915e4babf53bd23324ea15148a 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 bff8d421..081cbed3 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:7b0d09627502b79095f9927e2930bdc471c7614777bfb52d4b07f10ec209bdbc +keyring_image = ghcr.io/pkgforge-dev/archlinux:ppc64le@sha256:498b40dcc472c54f45763a4764557b848069b79794713df4d10890449af3cf22 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 b7cafb97..bfcb2e55 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:7b0d09627502b79095f9927e2930bdc471c7614777bfb52d4b07f10ec209bdbc +keyring_image = ghcr.io/pkgforge-dev/archlinux:ppc64le@sha256:498b40dcc472c54f45763a4764557b848069b79794713df4d10890449af3cf22 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 aee5ca34..1580bd6e 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:060424a8da0b8381dbf07b0a3e28ffc334b97073d1c9671556e89aad078da2a3 +keyring_image = ghcr.io/pkgforge-dev/archlinux:riscv64@sha256:71ce9e1edcd45e4b14b5bb4ae9f0d360f24cd387d8589c29a5ceee572006dfd2 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 8f6851ea..722f6d37 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:060424a8da0b8381dbf07b0a3e28ffc334b97073d1c9671556e89aad078da2a3 +keyring_image = ghcr.io/pkgforge-dev/archlinux:riscv64@sha256:71ce9e1edcd45e4b14b5bb4ae9f0d360f24cd387d8589c29a5ceee572006dfd2 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 61ddba76..80b12ec8 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:dd89780d86c0941d612b5aa6203c5e6c446db7b6d98130b7556c98c5c6dcff06' +IMG='ghcr.io/pkgforge-dev/archlinux:aarch64@sha256:0084c063c5c595e32e534aae451225c5a6a1bb5c605f9538dd4307df89fa240b' # trust NAME LINES...: a target file of x86_64 extra, with x86_64-core beside it trust() { local d="$work/trust-$1"