diff options
| -rw-r--r-- | CHANGELOG.txt | 17 | ||||
| -rw-r--r-- | VERSION.txt | 2 | ||||
| -rwxr-xr-x | share/build-scripts/debconf | 32 | ||||
| -rwxr-xr-x | share/build-scripts/debconf.d/0003-debconf | 28 | ||||
| -rwxr-xr-x | share/build-scripts/debootstrap | 4 | ||||
| -rw-r--r-- | share/doc/examples/horok-backports.cfg (renamed from share/doc/examples/graograman-backports.cfg) | 6 | ||||
| -rw-r--r-- | share/doc/examples/trixie.cfg (renamed from share/doc/examples/bookworm.cfg) | 6 | ||||
| -rw-r--r-- | share/doc/host-setup.txt | 2 | ||||
| -rw-r--r-- | share/man/container-build-debootstrap.1.rst | 10 | ||||
| -rw-r--r-- | share/man/container-get-curl.1.rst | 10 |
10 files changed, 84 insertions, 33 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index d6a189e..e834c2c 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,20 @@ +2025-01-26 Daniel Baumann <daniel.baumann@open-infrastructure.net> + + * Releasing version 2025-01-26. + + [ Daniel Baumann ] + * Correcting typo in host-setup documentation. + * Removing automatic inclusion of apt-transport-https when using https in container-build scripts, not needed for buster and newer. + * Adding support for Debian trixie in debconf container build-script. + * Updating signed-by apt keyring handling for non-released distributions in debconf container build-script. + * Setting default distribution to trixie in all container-build script. + * Updating example preseed.cfg from bookworm to trixie. + * Updating manpages references from bookworm to trixie. + * Trimming logic for non-free-firmware archive-area handling now that majority of the supported distributions have it. + * Updating example preseed.cfg from graograman-backports to horok-backports. + * Adding support for trixie based Progress Linux in debconf container build-scripts. + * Setting default Progress Linux distribution to horok-backports. + 2024-08-29 Daniel Baumann <daniel.baumann@open-infrastructure.net> * Releasing version 2024-08-29. diff --git a/VERSION.txt b/VERSION.txt index 0b8bcef..1e4e11a 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -20240829 +20250126 diff --git a/share/build-scripts/debconf b/share/build-scripts/debconf index 2dd8cb7..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,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) @@ -589,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} @@ -626,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="" @@ -657,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 diff --git a/share/doc/examples/graograman-backports.cfg b/share/doc/examples/horok-backports.cfg index d1d2640..fde4b60 100644 --- a/share/doc/examples/graograman-backports.cfg +++ b/share/doc/examples/horok-backports.cfg @@ -1,4 +1,4 @@ -# example for automated Progress Linux 7.99 (graograman-backports) container building +# example for automated Progress Linux 8.99 (horok-backports) container building # using: sudo container build -s progress-linux debconf debconf/priority select critical @@ -9,12 +9,12 @@ compute-tools container/mode select progress-linux #compute-tools container/preseed-files string #compute-tools container/include-preseed-files string -compute-tools container/distribution select graograman-backports +compute-tools container/distribution select horok-backports #compute-tools container/parent-distribution select compute-tools container/architecture select auto -compute-tools container/archives multiselect graograman-security, graograman-updates, graograman-extras, graograman-backports, graograman-backports-extras +compute-tools container/archives multiselect horok-security, horok-updates, horok-extras, horok-backports, horok-backports-extras #compute-tools container/parent-archives multiselect compute-tools container/mirror string https://deb.progress-linux.org/packages diff --git a/share/doc/examples/bookworm.cfg b/share/doc/examples/trixie.cfg index a618928..7e7778c 100644 --- a/share/doc/examples/bookworm.cfg +++ b/share/doc/examples/trixie.cfg @@ -1,4 +1,4 @@ -# example for automated Debian 12 (bookworm) based container building +# example for automated Debian 13 (trixie) based container building # using: sudo container build -s debian debconf debconf/priority select critical @@ -9,12 +9,12 @@ compute-tools container/mode select debian #compute-tools container/preseed-files string #compute-tools container/include-preseed-files string -compute-tools container/distribution select bookworm +compute-tools container/distribution select trixie #compute-tools container/parent-distribution select compute-tools container/architecture select auto -compute-tools container/archives multiselect bookworm-security, bookworm-updates +compute-tools container/archives multiselect trixie-security, trixie-updates #compute-tools container/parent-archives multiselect compute-tools container/mirror string https://deb.debian.org/debian diff --git a/share/doc/host-setup.txt b/share/doc/host-setup.txt index bf2963f..432aa20 100644 --- a/share/doc/host-setup.txt +++ b/share/doc/host-setup.txt @@ -56,7 +56,7 @@ EOF cat > /etc/systemd/network/bridge0.network << EOF [Match] -Name=bridge-0 +Name=bridge0 [Network] DHCP=yes diff --git a/share/man/container-build-debootstrap.1.rst b/share/man/container-build-debootstrap.1.rst index c7568fa..6790cd2 100644 --- a/share/man/container-build-debootstrap.1.rst +++ b/share/man/container-build-debootstrap.1.rst @@ -61,7 +61,7 @@ The following script options are available: Specify the Debian architecture, defaults to the host systems architecture. -d, --distribution='DISTRIBUTION': - Specify the Debian distribution, defaults to 'bookworm'. + Specify the Debian distribution, defaults to 'trixie'. -m, --mirror='MIRROR': Specify the Debian mirror, defaults to 'https://deb.debian.org/debian'. @@ -72,15 +72,15 @@ The following script options are available: Examples ======== -Build a Debian 12 (bookworm) based container with same architecture as the host +Build a Debian 13 (trixie) based container with same architecture as the host system using debootstrap: - sudo container build -s debootstrap -n bookworm.example.net + sudo container build -s debootstrap -n trixie.example.net -Build a Debian 12 (bookworm) based container with different architecture as the +Build a Debian 13 (trixie) based container with different architecture as the host system using mmdebstrap: - sudo container build -s mmdebstrap -n bookworm-i386.example.net -- -a i386 + sudo container build -s mmdebstrap -n trixie-i386.example.net -- -a i386 See also ======== diff --git a/share/man/container-get-curl.1.rst b/share/man/container-get-curl.1.rst index 70a1e08..5650846 100644 --- a/share/man/container-get-curl.1.rst +++ b/share/man/container-get-curl.1.rst @@ -82,22 +82,22 @@ The following script options are available: --system='SYSTEM': Specify the system image name to download, defaults to - debian-bookworm-current_${ARCHITECTURE}.system.tar.${COMPRESSION} (where + debian-trixie-current_${ARCHITECTURE}.system.tar.${COMPRESSION} (where ${ARCHITECTURE} is the host systems architecture and ${COMPRESSION} either lz, xz, or gz depending on compressor availability on the host system). Examples ======== -Download a Debian 12 (bookworm) based container with same architecture as the host +Download a Debian 13 (trixie) based container with same architecture as the host system: - sudo container get -s curl -n bookworm.example.net + sudo container get -s curl -n trixie.example.net -Download a Debian 12 (bookworm) based container with different architecture as the +Download a Debian 13 (trixie) based container with different architecture as the host system: - sudo container get -s curl -n bookworm-i386.example.net -- --system debian-bookworm-current_i386.system.tar.xz + sudo container get -s curl -n trixie-i386.example.net -- --system debian-trixie-current_i386.system.tar.xz Files ===== |