[neon/neon/livecd-rootfs/Neon/release] live-build/auto: try and use pubring.kbx

Carlos De Maine null at kde.org
Mon Aug 26 15:01:05 BST 2024


Git commit 27a2ff89d8f7628b379a9276810d8c7300c07601 by Carlos De Maine.
Committed on 26/08/2024 at 14:00.
Pushed by carlosdem into branch 'Neon/release'.

try and use pubring.kbx

M  +4    -3    live-build/auto/build

https://invent.kde.org/neon/neon/livecd-rootfs/-/commit/27a2ff89d8f7628b379a9276810d8c7300c07601

diff --git a/live-build/auto/build b/live-build/auto/build
index 6a515365..4e22d58d 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -344,10 +344,11 @@ Signed-By: /etc/apt/keyrings/preinstalled-pool.gpg
 				chroot/var/lib/preinstalled-pool/dists/$R_CODENAME/Release.gpg
 			# export pubring.gpg as modern gnupg stores everything in pubring.kbx by default
 			ls -lshR config/gnupg/
-			gpg --verbose --home config/gnupg --export-options export-minimal \
-				--keyring config/gnupg/pubring.kbx --output config/gnupg/pubring.gpg --export
+			#gpg --verbose --home config/gnupg --export-options export-minimal \
+			#	--keyring config/gnupg/pubring.kbx --output config/gnupg/pubring.gpg --export
 			# move pubring.gpg to where the .sources expects it
-			mv -v config/gnupg/pubring.gpg chroot/etc/apt/keyrings/preinstalled-pool.gpg
+			mv -v config/gnupg/pubring.kbx chroot/etc/apt/keyrings/preinstalled-pool.gpg
+			ls -lsh config/gnupg/
 			echo "finding packages in pool"
 			find chroot/var/lib/preinstalled-pool/ -name Packages | xargs rm
 


More information about the Neon-commits mailing list