From 5795c872c75e7adfef08097332e94b8d3155c546 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Date: Sun, 26 Jan 2025 19:46:48 +0100
Subject: Updating signed-by apt keyring handling for non-released
 distributions in debconf container build-script.

Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
---
 share/build-scripts/debconf | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/share/build-scripts/debconf b/share/build-scripts/debconf
index 7bc8c06..e2765c0 100755
--- a/share/build-scripts/debconf
+++ b/share/build-scripts/debconf
@@ -503,9 +503,17 @@ URIs: ${PARENT_MIRROR}
 Suites: ${PARENT_DIST}
 Components: ${PARENT_AREA}
 PDiffs: no
+EOF
+
+	if [ -e "${DIRECTORY}/usr/share/keyrings/debian-archive-${PARENT_DIST}-stable.gpg" ]
+	then
+
+cat >> "${DIRECTORY}/etc/apt/sources.list.d/debian.sources" << EOF
 Signed-By: /usr/share/keyrings/debian-archive-${PARENT_DIST}-stable.gpg
 EOF
 
+	fi
+
 	case "${MODE}" in
 		progress-linux)
 
@@ -595,9 +603,17 @@ URIs: ${PARENT_MIRROR}
 Suites: ${PARENT_DIST}
 Components: ${PARENT_AREA}
 PDiffs: no
+EOF
+
+	if [ -e "${DIRECTORY}/usr/share/keyrings/debian-archive-${PARENT_DIST}-stable.gpg" ]
+	then
+
+cat >> "${DIRECTORY}/etc/apt/sources.list.d/debian.sources" << EOF
 Signed-By: /usr/share/keyrings/debian-archive-${PARENT_DIST}-stable.gpg
 EOF
 
+	fi
+
 	AUTOMATIC_SUITES=""
 
 	for PARENT_REPO in ${PARENT_ARCHIVES}
@@ -632,9 +648,16 @@ URIs: ${PARENT_MIRROR}
 Suites: ${AUTOMATIC_SUITES}
 Components: ${PARENT_AREA}
 PDiffs: no
+EOF
+
+		if [ -e "${DIRECTORY}/usr/share/keyrings/debian-archive-${PARENT_DIST}-automatic.gpg" ]
+		then
+
+cat >> "${DIRECTORY}/etc/apt/sources.list.d/debian.sources" << EOF
 Signed-By: /usr/share/keyrings/debian-archive-${PARENT_DIST}-automatic.gpg
 EOF
 
+		fi
 	fi
 
 	SECURITY_SUITES=""
@@ -663,9 +686,16 @@ URIs: ${PARENT_MIRROR_SECURITY}
 Suites: ${PARENT_DIST}-security
 Components: ${PARENT_AREA}
 PDiffs: no
+EOF
+
+		if [ -e "${DIRECTORY}/usr/share/keyrings/debian-archive-${PARENT_DIST}-security-automatic.gpg" ]
+		then
+
+cat >> "${DIRECTORY}/etc/apt/sources.list.d/debian.sources" << EOF
 Signed-By: /usr/share/keyrings/debian-archive-${PARENT_DIST}-security-automatic.gpg
 EOF
 
+		fi
 	fi
 
 	case "${MODE}" in
-- 
cgit v1.2.3