Ignore EXPKEYSIG for debian ports as well

Signed-off-by: You-Sheng Yang <[email protected]>
vicamo · May 6, 2024 · 46b7315 · 46b7315
1 parent bbf4546
commit 46b7315
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -55,8 +55,8 @@ jobs:
 
           # qemu-debootstrap testing
           - { ARCH: arm64,   SUITE: jessie,   CODENAME: "", TIMESTAMP: "2017-01-01T00:00:00Z", SHA256: 45b3c398b472ff45399cc6cc633005f48d2359d0df8d905022d37a29434420cf }
-          - { ARCH: sh4,     SUITE: unstable, CODENAME: "", TIMESTAMP: "2022-02-01T00:00:00Z", SHA256: 8cf5ac04cd174465aff38484b0cd1b5ad83fe14585322f99a7db404b6dc02275 }
-          - { ARCH: riscv64, SUITE: unstable, CODENAME: "", TIMESTAMP: "2022-02-01T00:00:00Z", SHA256: 3f0d1dc0cb525aa47e6d9947fa7d6e207f7fd72a1d023872a874d6202e020232 }
+          - { ARCH: sh4,     SUITE: unstable, CODENAME: "", TIMESTAMP: "2022-02-01T00:00:00Z", SHA256: 4eeb5e0581b85da5cd686daa390c059674e301a69b2be47d532686652baf98c4 }
+          - { ARCH: riscv64, SUITE: unstable, CODENAME: "", TIMESTAMP: "2022-02-01T00:00:00Z", SHA256: 4f871585ea9888fe3330269eb2258c31f01aade35c0b3007f7755e9551845e4f }
 
           # a few entries for "today" to try and catch issues like https://github.com/debuerreotype/debuerreotype/issues/41 sooner
           - { SUITE: unstable,  CODENAME: "", TIMESTAMP: "today 00:00:00", SHA256: "" }

diff --git a/examples/debian.sh b/examples/debian.sh
@@ -212,7 +212,7 @@ fi
 
 addGpgvIgnore= # whether to invoke "debuerreotype-gpgv-ignore-expiration-config"
 excludeGpgvIgnore= # whether to let the "gpgv-ignore-expiration" script/config stay in the final image
-if [ -n "$eol" ]; then
+if [ -n "$eol" ] || [ -n "$ports" ]; then
 	# if we're building this rootfs *expecting* it to be EOL, we should always include the gpgv hacks in the final output
 	addGpgvIgnore=1
 elif [ -s "$tmpDir/gpgv-status.txt" ] && grep -F '[GNUPG:] EXPKEYSIG ' "$tmpDir/gpgv-status.txt"; then