[neon/infrastructure/pangea-data] imager: gpg(2) all the way

[Carlos De Maine]

Git commit 80ee55acdf67542c1856479cbc687ce31d0e343a by Carlos De Maine.
Committed on 06/08/2024 at 01:25.
Pushed by carlosdem into branch 'master'.

gpg(2) all the way

M  +0    -1    imager/config-hooks-neon/99-preinstalled-pool.sh
M  +3    -4    imager/config-hooks-neon/repo.sh
M  +1    -1    imager/ubuntu-defaults-image

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

diff --git a/imager/config-hooks-neon/99-preinstalled-pool.sh b/imager/config-hooks-neon/99-preinstalled-pool.sh
index 9877d6a..49d13e8 100644
--- a/imager/config-hooks-neon/99-preinstalled-pool.sh
+++ b/imager/config-hooks-neon/99-preinstalled-pool.sh
@@ -1,4 +1,3 @@
-
 mkdir -vp -m 0700 config/gnupg
 mkdir -vp -m 0700 config/indices
 
diff --git a/imager/config-hooks-neon/repo.sh b/imager/config-hooks-neon/repo.sh
index 590bdaf..25950dc 100644
--- a/imager/config-hooks-neon/repo.sh
+++ b/imager/config-hooks-neon/repo.sh
@@ -1,11 +1,10 @@
-# Use gpg1, mostly because we are lazy and don't know how to best port this to v2
-apt install -y dirmngr gnupg1
+apt install -y dirmngr
 ARGS="--batch --verbose"
-GPG="gpg1"
+GPG="gpg"
 
 apt-key export '444D ABCF 3667 D028 3F89  4EDD E6D4 7362 5575 1E5D' | $GPG \
   $ARGS \
-  --no-default-keyring \
+  --home config/gnupg \
   --primary-keyring config/archives/ubuntu-defaults.key \
   --import
 
diff --git a/imager/ubuntu-defaults-image b/imager/ubuntu-defaults-image
index 0ffaaa8..392c6aa 100755
--- a/imager/ubuntu-defaults-image
+++ b/imager/ubuntu-defaults-image
@@ -77,7 +77,7 @@ add_ppas () {
         FINGERPRINT=${FINGERPRINT#'"'}
 
         # fetch GPG key
-        gpg --no-default-keyring --primary-keyring config/archives/ubuntu-defaults.key  --keyserver pool.sks-keyservers.net --recv-key "$FINGERPRINT"
+        gpg --home config/gnupg --primary-keyring config/archives/ubuntu-defaults.key  --keyserver pool.sks-keyservers.net --recv-key "$FINGERPRINT"
 
         # add ppa apt source
         local DEB_PPA="deb http://ppa.launchpad.net/$ppa/ubuntu $SUITE main"