From d3ef59235b19a28456ad7d037d1ecf7785d83a97 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Thu, 28 Mar 2019 10:53:12 -0500
Subject: [PATCH] chroot: factor out backports
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
scripts/chroot.sh | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/scripts/chroot.sh b/scripts/chroot.sh
index 43ff34bee..bab635b89 100755
--- a/scripts/chroot.sh
+++ b/scripts/chroot.sh
@@ -362,6 +362,7 @@ case "${deb_codename}" in
buster|sid)
echo "#deb http://${deb_mirror} ${deb_codename}-updates ${deb_components}" >> ${wfile}
echo "##deb-src http://${deb_mirror} ${deb_codename}-updates ${deb_components}" >> ${wfile}
+ echo "" >> ${wfile}
;;
jessie)
echo "###For Debian 8 Jessie, jessie-updates no longer exists as this suite no longer receives updates since 2018-05-17." >> ${wfile}
@@ -369,6 +370,7 @@ jessie)
*)
echo "deb http://${deb_mirror} ${deb_codename}-updates ${deb_components}" >> ${wfile}
echo "#deb-src http://${deb_mirror} ${deb_codename}-updates ${deb_components}" >> ${wfile}
+ echo "" >> ${wfile}
;;
esac
@@ -378,14 +380,6 @@ jessie|stretch)
echo "" >> ${wfile}
echo "deb http://deb.debian.org/debian-security ${deb_codename}/updates ${deb_components}" >> ${wfile}
echo "#deb-src http://deb.debian.org/debian-security ${deb_codename}/updates ${deb_components}" >> ${wfile}
- echo "" >> ${wfile}
- if [ "x${chroot_enable_debian_backports}" = "xenable" ] ; then
- echo "deb http://deb.debian.org/debian ${deb_codename}-backports ${deb_components}" >> ${wfile}
- echo "#deb-src http://deb.debian.org/debian ${deb_codename}-backports ${deb_components}" >> ${wfile}
- else
- echo "#deb http://deb.debian.org/debian ${deb_codename}-backports ${deb_components}" >> ${wfile}
- echo "##deb-src http://deb.debian.org/debian ${deb_codename}-backports ${deb_components}" >> ${wfile}
- fi
;;
buster|sid)
echo "" >> ${wfile}
@@ -395,6 +389,17 @@ buster|sid)
;;
esac
+#https://wiki.debian.org/Backports
+if [ "x${chroot_enable_debian_backports}" = "xenable" ] ; then
+ case "${deb_codename}" in
+ jessie|stretch)
+ echo "deb http://deb.debian.org/debian ${deb_codename}-backports ${deb_components}" >> ${wfile}
+ echo "#deb-src http://deb.debian.org/debian ${deb_codename}-backports ${deb_components}" >> ${wfile}
+ echo "" >> ${wfile}
+ ;;
+ esac
+fi
+
if [ "x${repo_external}" = "xenable" ] ; then
echo "" >> ${wfile}
echo "deb [arch=${repo_external_arch}] ${repo_external_server} ${repo_external_dist} ${repo_external_components}" >> ${wfile}
--
GitLab