From a59844322b10597ad9f738a6ec2e883ab168ced8 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Date: Sun, 2 Oct 2022 17:31:22 +0200
Subject: Using debian.sources instead of debian.list in debconf build scripts.

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

diff --git a/share/build-scripts/debconf b/share/build-scripts/debconf
index b589fce..981ea99 100755
--- a/share/build-scripts/debconf
+++ b/share/build-scripts/debconf
@@ -426,10 +426,13 @@ Configure_apt ()
 	PARENT_AREA="$(echo ${PARENT_ARCHIVE_AREAS} | sed -e 's|,| |g')"
 	PARENT_DIST="$(echo ${PARENT_DISTRIBUTION} | sed -e 's|-backports||')"
 
-cat > "${DIRECTORY}/etc/apt/sources.list.d/debian.list" << EOF
-# /etc/apt/sources.list.d/debian.list
+cat > "${DIRECTORY}/etc/apt/sources.list.d/debian.sources" << EOF
+# /etc/apt/sources.list.d/debian.sources
 
-deb ${PARENT_MIRROR} ${PARENT_DIST} ${PARENT_AREA}
+Types: deb
+URIs: ${PARENT_MIRROR}
+Suites: ${PARENT_DIST}
+Components: ${PARENT_AREA}
 EOF
 
 	case "${MODE}" in
@@ -500,37 +503,59 @@ Configure_system ()
 	PARENT_AREA="$(echo ${PARENT_ARCHIVE_AREAS} | sed -e 's|,| |g')"
 	PARENT_DIST="$(echo ${PARENT_DISTRIBUTION} | sed -e 's|-backports||')"
 
-cat > "${DIRECTORY}/etc/apt/sources.list.d/debian.list" << EOF
-# /etc/apt/sources.list.d/debian.list
+cat > "${DIRECTORY}/etc/apt/sources.list.d/debian.sources" << EOF
+# /etc/apt/sources.list.d/debian.sources
 
-deb ${PARENT_MIRROR} ${PARENT_DIST} ${PARENT_AREA}
 EOF
 
+	PARENT_DISTS=""
+
 	for PARENT_REPO in ${PARENT_ARCHIVES}
 	do
 		case "${PARENT_REPO}" in
-			buster-security)
-				echo "deb ${PARENT_MIRROR_SECURITY} ${PARENT_DIST}/updates ${PARENT_AREA}" >> "${DIRECTORY}/etc/apt/sources.list.d/debian.list"
-				;;
-
 			${PARENT_DIST}-security)
-				echo "deb ${PARENT_MIRROR_SECURITY} ${PARENT_DIST}-security ${PARENT_AREA}" >> "${DIRECTORY}/etc/apt/sources.list.d/debian.list"
+				PARENT_DISTS="${PARENT_DISTS} ${PARENT_DIST}-security"
 				;;
 
 			${PARENT_DIST}-updates)
-				echo "deb ${PARENT_MIRROR} ${PARENT_DIST}-updates ${PARENT_AREA}" >> "${DIRECTORY}/etc/apt/sources.list.d/debian.list"
+				PARENT_DISTS="${PARENT_DISTS} ${PARENT_DIST}-updates"
 				;;
 
 			${PARENT_DIST}-backports)
-				echo "deb ${PARENT_MIRROR} ${PARENT_DIST}-backports ${PARENT_AREA}" >> "${DIRECTORY}/etc/apt/sources.list.d/debian.list"
+				PARENT_DISTS="${PARENT_DISTS} ${PARENT_DIST}-backports"
 				;;
 
 			${PARENT_DIST}-proposed-updates)
-				echo "deb ${PARENT_MIRROR} ${PARENT_DIST}-proposed-updates ${PARENT_AREA}" >> "${DIRECTORY}/etc/apt/sources.list.d/debian.list"
+				PARENT_DISTS="${PARENT_DISTS} ${PARENT_DIST}-proposed-updates"
 				;;
 
 			experimental)
-				echo "deb ${PARENT_MIRROR} experimental ${PARENT_AREA}" >> "${DIRECTORY}/etc/apt/sources.list.d/debian.list"
+				PARENT_DISTS="${PARENT_DISTS} experimental"
+				;;
+		esac
+	done
+
+cat >> "${DIRECTORY}/etc/apt/sources.list.d/debian.sources" << EOF
+Types: deb
+URIs: ${PARENT_MIRROR}
+Suites: ${PARENT_DISTS}
+Components: ${PARENT_AREA}
+EOF
+
+	# buster legacy
+	for PARENT_REPO in ${PARENT_ARCHIVES}
+	do
+		case "${PARENT_REPO}" in
+			buster-security)
+
+cat >> "${DIRECTORY}/etc/apt/sources.list.d/debian.sources" << EOF
+
+Types: deb
+URIs: ${PARENT_MIRROR_SECURITY}
+Suites: ${PARENT_DIST}/updates
+Components: ${PARENT_AREA}
+EOF
+
 				;;
 		esac
 	done
-- 
cgit v1.2.3