diff --git a/debian/changelog b/debian/changelog index 92013548..a0e507c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ livecd-rootfs (2.781) UNRELEASED; urgency=medium multiverse is historic, all firmware is now in restricted where it should be; and raspi images should not categorically include universe, they should follow the per-flavor rules. + * Drop use of deprecated apt-key. -- Steve Langasek Wed, 21 Sep 2022 13:26:30 -0700 diff --git a/live-build/auto/build b/live-build/auto/build index 9a1fd8ff..9c1f0fc9 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -432,7 +432,7 @@ deb file:/var/lib/preinstalled-pool/ $LB_DISTRIBUTION $LB_PARENT_ARCHIVE_AREAS chroot/var/lib/preinstalled-pool/dists/$R_CODENAME/Release mv config/gnupg/Release.asc \ chroot/var/lib/preinstalled-pool/dists/$R_CODENAME/Release.gpg - apt-key --keyring chroot/etc/apt/trusted.gpg add config/gnupg/pubring.gpg + cp config/gnupg/pubring.gpg chroot/etc/apt/trusted.gpg.d/livecd-rootfs.gpg find chroot/var/lib/preinstalled-pool/ -name Packages | xargs rm Chroot chroot "apt-get update"