diff options
Diffstat (limited to '')
| -rwxr-xr-x | share/build-scripts/debconf | 38 | ||||
| -rwxr-xr-x | share/build-scripts/debconf.d/0003-debconf | 28 | ||||
| -rwxr-xr-x | share/build-scripts/debootstrap | 4 |
3 files changed, 49 insertions, 21 deletions
diff --git a/share/build-scripts/debconf b/share/build-scripts/debconf index 9e28216..cf3922a 100755 --- a/share/build-scripts/debconf +++ b/share/build-scripts/debconf @@ -378,7 +378,7 @@ Bootstrap () if ( echo "${MIRROR}" | grep -qs '^https' ) || \ ( echo "${PARENT_MIRROR}" | grep -qs '^https' ) then - INCLUDE="${INCLUDE},apt-transport-https,ca-certificates" + INCLUDE="${INCLUDE},ca-certificates" fi case "${MODE}" in @@ -503,18 +503,20 @@ 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) - # temporary sideloading new keys until keyring package in debian-stable has been updated - if [ -e "${DIRECTORY}/usr/share/progress-linux/pgp-keys/apt.progress-linux.org.gpg" ] - then - cp -f /usr/share/compute-tools/other/deb.progress-linux.org.gpg "${DIRECTORY}/usr/share/progress-linux/pgp-keys/apt.progress-linux.org.gpg" - fi - cat > "${DIRECTORY}/progress-linux.cfg" << EOF progress-linux progress-linux/archives multiselect $(echo ${ARCHIVES} | sed -e 's| |, |g') progress-linux progress-linux/archive-areas multiselect $(echo ${ARCHIVE_AREAS} | sed -e 's|,| |g') @@ -595,9 +597,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 +642,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 +680,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 diff --git a/share/build-scripts/debconf.d/0003-debconf b/share/build-scripts/debconf.d/0003-debconf index b5b252b..3faf266 100755 --- a/share/build-scripts/debconf.d/0003-debconf +++ b/share/build-scripts/debconf.d/0003-debconf @@ -86,18 +86,18 @@ Distribution () then case "${MODE}" in debian) - db_subst container/distribution CHOICES "Debian GNU/Linux 10 \"buster\", Debian GNU/Linux 11 \"bullseye\", Debian GNU/Linux 12 \"bookworm\", Debian GNU/Linux testing, Debian GNU/Linux unstable/sid" - db_subst container/distribution CHOICES_C "buster, bullseye, bookworm, testing, sid" + db_subst container/distribution CHOICES "Debian GNU/Linux 10 \"buster\", Debian GNU/Linux 11 \"bullseye\", Debian GNU/Linux 12 \"bookworm\", Debian GNU/Linux 13 \"trixie\", Debian GNU/Linux testing, Debian GNU/Linux unstable/sid" + db_subst container/distribution CHOICES_C "buster, bullseye, bookworm, trixie, testing, sid" - db_set container/distribution bookworm + db_set container/distribution trixie db_fset container/distribution seen false ;; progress-linux) - db_subst container/distribution CHOICES "Progress Linux 5 (engywuck), Progress Linux 5.99 (engywuck-backports), Progress Linux 6 (fuchur), Progress Linux 6.99 (fuchur-backports), Progress Linux 7 (graograman), Progress Linux 7.99 (graograman-backports)" - db_subst container/distribution CHOICES_C "engywuck, engywuck-backports, fuchur, fuchur-backports, graograman, graograman-backports" + db_subst container/distribution CHOICES "Progress Linux 5 (engywuck), Progress Linux 5.99 (engywuck-backports), Progress Linux 6 (fuchur), Progress Linux 6.99 (fuchur-backports), Progress Linux 7 (graograman), Progress Linux 7.99 (graograman-backports), Progress Linux 8 (horok), Progress Linux 8.99 (horok-backports)" + db_subst container/distribution CHOICES_C "engywuck, engywuck-backports, fuchur, fuchur-backports, graograman, graograman-backports, horok, horok-backports" - db_set container/distribution graograman-backports + db_set container/distribution horok-backports db_fset container/distribution seen false ;; esac @@ -135,6 +135,10 @@ Parent_distribution () graograman*) PARENT_DISTRIBUTION="bookworm" ;; + + horok*) + PARENT_DISTRIBUTION="trixie" + ;; esac ;; @@ -523,12 +527,12 @@ Archive_areas () ARCHIVE_AREAS="${RET}" case "${PARENT_DISTRIBUTION}" in - bookworm|testing|sid) - ARCHIVE_AREAS_ALL="main, contrib, non-free, non-free-firmware" + buster|bullseye) + ARCHIVE_AREAS_ALL="main, contrib, non-free" ;; *) - ARCHIVE_AREAS_ALL="main, contrib, non-free" + ARCHIVE_AREAS_ALL="main, contrib, non-free, non-free-firmware" ;; esac @@ -583,12 +587,12 @@ Parent_archive_areas () PARENT_ARCHIVE_AREAS="${RET}" # multiselect (w/o empty) case "${PARENT_DISTRIBUTION}" in - bookworm|testing|sid) - PARENT_ARCHIVE_AREAS_ALL="main, contrib, non-free, non-free-firmware" + buster|bullseye) + PARENT_ARCHIVE_AREAS_ALL="main, contrib, non-free" ;; *) - PARENT_ARCHIVE_AREAS_ALL="main, contrib, non-free" + PARENT_ARCHIVE_AREAS_ALL="main, contrib, non-free, non-free-firmware" ;; esac diff --git a/share/build-scripts/debootstrap b/share/build-scripts/debootstrap index 696c7b4..27530e7 100755 --- a/share/build-scripts/debootstrap +++ b/share/build-scripts/debootstrap @@ -153,7 +153,7 @@ then fi ARCHITECTURE="${ARCHITECTURE:-$(dpkg --print-architecture)}" -DISTRIBUTION="${DISTRIBUTION:-bookworm}" +DISTRIBUTION="${DISTRIBUTION:-trixie}" MIRROR="${MIRROR:-https://deb.debian.org/debian}" PASSWORD="${PASSWORD:-$(dd if=/dev/urandom bs=12 count=1 2> /dev/null | base64)}" @@ -161,7 +161,7 @@ INCLUDE="dbus" case "${MIRROR}" in https*) - INCLUDE="${INCLUDE},apt-transport-https,ca-certificates" + INCLUDE="${INCLUDE},ca-certificates" ;; esac |