[neon/neon/livecd-rootfs/Neon/unstable] live-build/auto: more debug

Carlos De Maine null at kde.org
Thu Aug 22 04:37:04 BST 2024


Git commit 952dd65fdff5d8d7ba9b1bb5617eba43180e815e by Carlos De Maine.
Committed on 22/08/2024 at 03:29.
Pushed by carlosdem into branch 'Neon/unstable'.

more debug

M  +5    -2    live-build/auto/build

https://invent.kde.org/neon/neon/livecd-rootfs/-/commit/952dd65fdff5d8d7ba9b1bb5617eba43180e815e

diff --git a/live-build/auto/build b/live-build/auto/build
index e858a026..90412c87 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -443,11 +443,14 @@ Signed-By: /etc/apt/keyrings/preinstalled-pool.gpg
 			gpg --verbose --home config/gnupg --detach-sign --armor config/gnupg/Release
 			mv -v config/gnupg/Release \
 				chroot/var/lib/preinstalled-pool/dists/$R_CODENAME/Release
-			gpg --verbose --home config/gnupg --export-options export-minimal --armour \
-			--keyring config/gnupg/pubring.kbx --output config/gnupg/pubring.gpg --export
 			mv -v config/gnupg/Release.asc \
 				chroot/var/lib/preinstalled-pool/dists/$R_CODENAME/Release.gpg
+			# export pubring.gpg as modern gnupg stores everythinh in pubring.kbx by default
+			gpg --verbose --home config/gnupg --export-options export-minimal --armour \
+				--keyring config/gnupg/pubring.kbx --output config/gnupg/pubring.gpg --export
+			# cp pubring.gpg to where the .sources expects it
 			cp -v config/gnupg/pubring.gpg chroot/etc/apt/keyrings/preinstalled-pool.gpg
+			echo "finding packages in pool"
 			find chroot/var/lib/preinstalled-pool/ -name Packages | xargs rm
 
 			## Mangle binary ISO maindir to contain cdrom repo.


More information about the Neon-commits mailing list