From 8403487d4e3bda65cdd2ea6081399f7977325adb Mon Sep 17 00:00:00 2001
From: Marcel Partap <mpartap@gmx.net>
Date: Wed, 12 Sep 2018 18:00:20 +0200
Subject: copy keys to /etc/apt/trusted.gpg.d with appropriate extension for
 them to not be ignored.

---
 scripts/build/bootstrap_archives | 7 ++++++-
 scripts/build/chroot_archives    | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/build/bootstrap_archives b/scripts/build/bootstrap_archives
index a5eca16a0..9e94680eb 100755
--- a/scripts/build/bootstrap_archives
+++ b/scripts/build/bootstrap_archives
@@ -222,7 +222,12 @@ then
 	do
 		if [ -e "${FILE}" ]
 		then
-			cp ${FILE} chroot/etc/apt/trusted.gpg.d/$(basename ${FILE}).asc
+			if grep -q "PGP PUBLIC KEY BLOCK" "${FILE}"
+			then
+				cp ${FILE} chroot/etc/apt/trusted.gpg.d/$(basename ${FILE}).asc
+			else
+				cp ${FILE} chroot/etc/apt/trusted.gpg.d/$(basename ${FILE}).gpg
+			fi
 		fi
 	done
 fi
diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives
index 2332388ba..11a5c4a80 100755
--- a/scripts/build/chroot_archives
+++ b/scripts/build/chroot_archives
@@ -353,7 +353,12 @@ EOF
 				do
 					if [ -e "${FILE}" ]
 					then
-						cp ${FILE} chroot/etc/apt/trusted.gpg.d/$(basename ${FILE}).asc
+						if grep -q "PGP PUBLIC KEY BLOCK" "${FILE}"
+						then
+							cp ${FILE} chroot/etc/apt/trusted.gpg.d/$(basename ${FILE}).asc
+						else
+							cp ${FILE} chroot/etc/apt/trusted.gpg.d/$(basename ${FILE}).gpg
+						fi
 					fi
 				done
 			fi
-- 
cgit v1.2.3