[neon/infrastructure/pangea-data] imager/config-hooks-neon: install neon-keyring early

[Carlos De Maine]

Git commit a608116b57a9e5f7b7260526917aaef68957039e by Carlos De Maine.
Committed on 06/08/2024 at 13:06.
Pushed by carlosdem into branch 'master'.

install neon-keyring early

M  +1    -0    imager/config-hooks-neon/20_package_list.sh
M  +4    -4    imager/config-hooks-neon/99-preinstalled-pool.sh
M  +1    -1    imager/config-hooks-neon/repo.sh

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

diff --git a/imager/config-hooks-neon/20_package_list.sh b/imager/config-hooks-neon/20_package_list.sh
index 79ffc23..eea26f1 100644
--- a/imager/config-hooks-neon/20_package_list.sh
+++ b/imager/config-hooks-neon/20_package_list.sh
@@ -8,4 +8,5 @@ grub-efi-amd64-signed
 grub-efi-ia32-bin
 konsole
 neon-desktop
+neon-keyring
 EOF
diff --git a/imager/config-hooks-neon/99-preinstalled-pool.sh b/imager/config-hooks-neon/99-preinstalled-pool.sh
index 3386b88..5ad1c33 100644
--- a/imager/config-hooks-neon/99-preinstalled-pool.sh
+++ b/imager/config-hooks-neon/99-preinstalled-pool.sh
@@ -13,11 +13,11 @@ EOF
 cat config/gnupg/gpg.conf
 # make sure we have a copy of the neon-archive-keyring.gpg
 # to be used as the preinstalled-pool's pubring.gpg
-wget https://archive.neon.kde.org/public.key
+#wget https://archive.neon.kde.org/public.key
 #gpg --home config/gnupg --import public.key
-cp -v public.key config/gnupg/pubring.gpg
-ls -lsh config/gnupg/
-cat config/gnupg/pubring.gpg
+#cp -v public.key config/gnupg/pubring.gpg
+#ls -lsh config/gnupg/
+#cat config/gnupg/pubring.gpg
 
 for component in $COMPONENTS; do
    (cd config/indices && \
diff --git a/imager/config-hooks-neon/repo.sh b/imager/config-hooks-neon/repo.sh
index ffb6cf8..25fb035 100644
--- a/imager/config-hooks-neon/repo.sh
+++ b/imager/config-hooks-neon/repo.sh
@@ -1,4 +1,4 @@
-apt install -y dirmngr neon-keyring
+apt install -y dirmngr
 mkdir -vp -m 0700 config/archives
 cp /usr/share/keyrings/neon-archive-keyring.gpg config/archives/ubuntu-defaults.gpg