Skip to content

Commit 09bcbca

Browse files
committed
fix(packaging): import archlinuxarm ownertrust files in arch smoke test
1 parent 88c9615 commit 09bcbca

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

‎packaging/checks/smoke-arch.sh‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,14 @@ cp /proc/self/mounts "$CHROOT_DIR/etc/mtab"
161161
# process substitution (/dev/fd), which requires a mounted /proc the chroot
162162
# does not have. The host container's pacman-key can act on the chroot's
163163
# keyring via --gpgdir once the archlinuxarm keyring is visible to it.
164-
cp "$CHROOT_DIR/usr/share/pacman/keyrings/archlinuxarm.gpg" /usr/share/pacman/keyrings/
164+
# The -trusted/-revoked companions are required alongside the keyring:
165+
# --populate applies ownertrust only from <keyring>-trusted; without it
166+
# every imported key lands at unknown trust and pacman refuses packages.
167+
for f in archlinuxarm.gpg archlinuxarm-trusted archlinuxarm-revoked; do
168+
cp "$CHROOT_DIR/usr/share/pacman/keyrings/$f" /usr/share/pacman/keyrings/
169+
done
165170
pacman-key --gpgdir "$CHROOT_DIR/etc/pacman.d/gnupg" --init >/dev/null
166-
pacman-key --gpgdir "$CHROOT_DIR/etc/pacman.d/gnupg" --populate archlinuxarm >/dev/null
171+
pacman-key --gpgdir "$CHROOT_DIR/etc/pacman.d/gnupg" --populate archlinuxarm
167172

168173
# /work is not visible inside the chroot: copy the script, its lib.sh and the
169174
# package in.

0 commit comments

Comments
 (0)