[neon/infrastructure/pangea-data] imager: drop the key download now it is in neon-keyring package

[Carlos De Maine]

Git commit 834e9807f185647412cf5b69f8e1ce7fa1a1c84d by Carlos De Maine.
Committed on 26/08/2024 at 07:41.
Pushed by carlosdem into branch 'master'.

drop the key download now it is in neon-keyring package

M  +0    -11   imager/config-hooks-neon-arm64/repo.sh
M  +0    -11   imager/config-hooks-neon/repo.sh

https://invent.kde.org/neon/infrastructure/pangea-data/-/commit/834e9807f185647412cf5b69f8e1ce7fa1a1c84d

diff --git a/imager/config-hooks-neon-arm64/repo.sh b/imager/config-hooks-neon-arm64/repo.sh
index 1c8173e..17fa0fd 100644
--- a/imager/config-hooks-neon-arm64/repo.sh
+++ b/imager/config-hooks-neon-arm64/repo.sh
@@ -24,16 +24,6 @@ apt-key export '444D ABCF 3667 D028 3F89 4EDD E6D4 7362 5575 1E5D' | $GPG \
 
 else
 
-apt install -y curl
-
-  # use this hack until new neon-keyring is in the wild, then we can use cp down below
-  mkdir -p /etc/apt/keyrings
-  chmod 700 ~/.gnupg
-  curl -s --compressed "https://invent.kde.org/neon/neon/keyring/-/raw/Neon/unstable/keyrings/neon-archive-keyring.gpg?ref_type=heads&inline=false" |  tee /etc/apt/keyrings/neon-archive-keyring-web.gpg >/dev/null
-  gpg --no-default-keyring --export-options export-minimal --batch --no-tty --keyring /etc/apt/keyrings/neon-archive-keyring-web.gpg --output /etc/apt/keyrings/neon-archive-keyring.gpg --export 444DABCF3667D0283F894EDDE6D4736255751E5D
-  gpg --export --keyring /etc/apt/keyrings/neon-archive-keyring.gpg --export-options export-minimal --armor > /etc/apt/keyrings/neon-archive-keyring.asc
-  gpg --import /etc/apt/keyrings/neon-archive-keyring.gpg
-
   # use ubuntu-defaults.key for iso creation until we can use neon-keyring package for LB_BOOTSTRAP_KEYRING='neon-keyring'
   cp /etc/apt/keyrings/neon-archive-keyring.gpg config/archives/ubuntu-defaults.key
   chmod 644 config/archives/ubuntu-defaults.key || true
@@ -42,7 +32,6 @@ apt install -y curl
   mkdir  -p chroot/etc/apt/keyrings/
   cp /etc/apt/keyrings/* chroot/etc/apt/keyrings/
 
-
   # 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
diff --git a/imager/config-hooks-neon/repo.sh b/imager/config-hooks-neon/repo.sh
index 1c8173e..17fa0fd 100644
--- a/imager/config-hooks-neon/repo.sh
+++ b/imager/config-hooks-neon/repo.sh
@@ -24,16 +24,6 @@ apt-key export '444D ABCF 3667 D028 3F89 4EDD E6D4 7362 5575 1E5D' | $GPG \
 
 else
 
-apt install -y curl
-
-  # use this hack until new neon-keyring is in the wild, then we can use cp down below
-  mkdir -p /etc/apt/keyrings
-  chmod 700 ~/.gnupg
-  curl -s --compressed "https://invent.kde.org/neon/neon/keyring/-/raw/Neon/unstable/keyrings/neon-archive-keyring.gpg?ref_type=heads&inline=false" |  tee /etc/apt/keyrings/neon-archive-keyring-web.gpg >/dev/null
-  gpg --no-default-keyring --export-options export-minimal --batch --no-tty --keyring /etc/apt/keyrings/neon-archive-keyring-web.gpg --output /etc/apt/keyrings/neon-archive-keyring.gpg --export 444DABCF3667D0283F894EDDE6D4736255751E5D
-  gpg --export --keyring /etc/apt/keyrings/neon-archive-keyring.gpg --export-options export-minimal --armor > /etc/apt/keyrings/neon-archive-keyring.asc
-  gpg --import /etc/apt/keyrings/neon-archive-keyring.gpg
-
   # use ubuntu-defaults.key for iso creation until we can use neon-keyring package for LB_BOOTSTRAP_KEYRING='neon-keyring'
   cp /etc/apt/keyrings/neon-archive-keyring.gpg config/archives/ubuntu-defaults.key
   chmod 644 config/archives/ubuntu-defaults.key || true
@@ -42,7 +32,6 @@ apt install -y curl
   mkdir  -p chroot/etc/apt/keyrings/
   cp /etc/apt/keyrings/* chroot/etc/apt/keyrings/
 
-
   # 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