[neon/infrastructure/pangea-data] imager/config-hooks-neon: hack in the armoured key until the new neon-keyring deb is released into the wild

[Carlos De Maine]

Git commit 9bbdd8ef7b3ebdc1acc5458d217804706072d20b by Carlos De Maine.
Committed on 16/08/2024 at 02:47.
Pushed by carlosdem into branch 'master'.

hack in the armoured key until the new neon-keyring deb is released into the wild

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

https://invent.kde.org/neon/infrastructure/pangea-data/-/commit/9bbdd8ef7b3ebdc1acc5458d217804706072d20b

diff --git a/imager/config-hooks-neon/repo.sh b/imager/config-hooks-neon/repo.sh
index bb6e07e..02fa7d0 100644
--- a/imager/config-hooks-neon/repo.sh
+++ b/imager/config-hooks-neon/repo.sh
@@ -24,8 +24,14 @@ apt-key export '444D ABCF 3667 D028 3F89 4EDD E6D4 7362 5575 1E5D' | $GPG \
 
 else
 
+  # use this hack until new neon-keyring is in the wild, then we can use cp down below
+  mkdir -p /etc/apt/keyring
+  curl -s --compressed "https://invent.kde.org/neon/neon/keyring/-/raw/work/overhaul/keyrings/neon-archive-keyring.gpg?ref_type=heads&inline=false" |  tee /etc/apt/keyring/neon-archive-keyring-web.gpg >/dev/null
+  gpg --no-default-keyring --export-options export-minimal --keyring /etc/apt/keyring/neon-archive-keyring-web.gpg --output /etc/apt//keyring/neon-archive-keyring.gpg --export 444DABCF3667D0283F894EDDE6D4736255751E5D
+  gpg --export --keyring /etc/apt/keyring/neon-archive-keyring.gpg --export-options export-minimal --armor > /etc/apt/keyring/neon-archive-keyring.asc
+
   # cp our non-armoured (binary) public key to where it needs to be
-  cp /usr/share/keyrings/neon-archive-keyring.gpg config/archives/ubuntu-defaults.key
+  cp /etc/apt/keyring/ config/archives/
 
   # make sure _apt can read this file. it may get copied into the chroot
   chmod 644 config/archives/ubuntu-defaults.key || true<
@@ -39,9 +45,9 @@ X-Repolib-Name: KDE neon $SUITE ${NEONARCHIVE}
 Types: deb deb-src
 URIs: http://archive.neon.kde.org/${NEONARCHIVE}
 Suites: $SUITE
-Components: $COMPONENTS
+Components: main
 Architectures: $ARCH
-Signed-By: /etc/apt/keyrings/neon-archive-keyring-pubkey.gpg
+Signed-By: /etc/apt/keyring/neon-archive-keyring-pubkey.asc
 EOF
 
   # check our config worked