[neon/infrastructure/pangea-data] imager/config-hooks-neon: more gnupg cleanups

[Carlos De Maine]

Git commit 028b1ed34deb4aef1b22cf05acf94724d869a5cb by Carlos De Maine.
Committed on 26/08/2024 at 05:48.
Pushed by carlosdem into branch 'master'.

more gnupg cleanups

M  +3    -6    imager/config-hooks-neon/repo.sh

https://invent.kde.org/neon/infrastructure/pangea-data/-/commit/028b1ed34deb4aef1b22cf05acf94724d869a5cb

diff --git a/imager/config-hooks-neon/repo.sh b/imager/config-hooks-neon/repo.sh
index 2d3e343..57576f8 100644
--- a/imager/config-hooks-neon/repo.sh
+++ b/imager/config-hooks-neon/repo.sh
@@ -38,17 +38,14 @@ apt install -y curl
   cp /etc/apt/keyrings/neon-archive-keyring.gpg config/archives/ubuntu-defaults.key
   chmod 644 config/archives/ubuntu-defaults.key || true
 
-  # cp our non-armoured (binary) public key to where it needs to be
+  # ensure our non-armoured (binary) public key is copied into the chroot as expected
   mkdir  -p chroot/etc/apt/keyrings/
-  # make sure the pre-installed pool has the keyring it expects
-  cp /etc/apt/keyrings/neon-archive-keyring.asc /etc/apt/keyrings/preinstalled-pool.gpg
   cp /etc/apt/keyrings/* chroot/etc/apt/keyrings/
 
 
-  # make sure _apt can read this file. it may get copied into the chroot
+  # make sure _apt can read this file. it will get copied into the chroot
   chmod 644 chroot/etc/apt/keyrings/neon-archive-keyring.asc || true
   chmod 644 chroot/etc/apt/keyrings/neon-archive-keyring.gpg || true
-  chmod 644 chroot/etc/apt/keyrings/preinstalled-pool.gpg || true
 
   # use a signed neon.list until we work out how to enable neon.sources in livecd-rootfs
   cat <<EOF >config/archives/neon.list
@@ -59,7 +56,7 @@ EOF
   # add a nice depreciation message when we actually have depreciated the above hack
   #echo "# KDE neon sources have moved to /etc/apt/sources.list.d/neon.sources" >> config/archives/neon.list
 
-  # add or spiffy new deb822 .sources config
+  # add our spiffy new deb822 .sources config
   cat > config/archives/neon.sources << EOF
 X-Repolib-Name: KDE neon $SUITE ${NEONARCHIVE}
 Types: deb deb-src