[neon/neon/livecd-rootfs/Neon/release_jammy] live-build/auto: Revert "gpg not gpg1 - hopefully signing will work again"

[Carlos De Maine]

Git commit 5679508df1fd7f068c95fc0478a060cc5cfe7131 by Carlos De Maine.
Committed on 07/08/2024 at 08:17.
Pushed by carlosdem into branch 'Neon/release_jammy'.

Revert "gpg not gpg1 - hopefully signing will work again"

This reverts commit b09558a66bb44abb7cb5c73b5ec592869140f83e

M  +2    -2    live-build/auto/build
M  +1    -1    live-build/auto/config

https://invent.kde.org/neon/neon/livecd-rootfs/-/commit/5679508df1fd7f068c95fc0478a060cc5cfe7131

diff --git a/live-build/auto/build b/live-build/auto/build
index 09aa200e..255c908b 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -147,7 +147,7 @@ Name-Real: Ubuntu Local Archive One-Time Signing Key
 Name-Email: cdimage at ubuntu.com
 Expire-Date: 0
 @@EOF
-		gpg --home config/gnupg --gen-key --batch < config/gnupg/NEWKEY \
+		gpg1 --home config/gnupg --gen-key --batch < config/gnupg/NEWKEY \
 			> config/gnupg/generate.log 2>&1 &
 		GPG_PROCESS=$!
 	fi
@@ -426,7 +426,7 @@ deb [arch=$(echo $LB_ARCHITECTURES | tr ' ', ',')] file:/var/lib/preinstalled-po
 				release chroot/var/lib/preinstalled-pool/dists/$R_CODENAME/ \
 					> config/gnupg/Release
 
-			gpg --home config/gnupg --detach-sign --armor config/gnupg/Release
+			gpg1 --home config/gnupg --detach-sign --armor config/gnupg/Release
 			mv config/gnupg/Release \
 				chroot/var/lib/preinstalled-pool/dists/$R_CODENAME/Release
 			mv config/gnupg/Release.asc \
diff --git a/live-build/auto/config b/live-build/auto/config
index f4f6483e..0feb42d5 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -1521,7 +1521,7 @@ if [ "$EXTRA_PPAS" ]; then
 	      config/archives/extra-ppas.key.chroot
 	gpg_tmpdir="$(mktemp -d)"
 	run_gpg () {
-		gpg --no-default-keyring --no-options --homedir "$gpg_tmpdir" \
+		gpg1 --no-default-keyring --no-options --homedir "$gpg_tmpdir" \
 			--secret-keyring "$gpg_tmpdir/secring.gpg" \
 			--keyserver hkp://keyserver.ubuntu.com:80/ \
 			"$@"