From 87fa30fd76c136a5779309ba4a26387aefac6d96 Mon Sep 17 00:00:00 2001 From: Patrick Schleizer Date: Wed, 15 Jan 2025 12:10:31 -0500 Subject: [PATCH] deprecate support for Debian `jessie` and `stretch` --- Makefile | 2 +- chroot-script | 11 ++--------- config | 2 +- docker/test_dirinstall.bats | 2 +- docker/test_vminstall.bats | 2 +- grml-debootstrap | 26 ++------------------------ grml-debootstrap.8.txt | 10 +++++----- packer/Makefile | 10 +--------- packer/debian64_provision.sh | 2 +- releasetable.txt | 2 -- tests/docker-build-vm.sh | 4 ---- 11 files changed, 15 insertions(+), 58 deletions(-) diff --git a/Makefile b/Makefile index 20e533b8..f8cd5c40 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,7 @@ clean: rm -rf grml-debootstrap.8.html grml-debootstrap.8.xml grml-debootstrap.8 html-stamp man-stamp packer/local_dir/ testrun: - cd ./packer && $(MAKE) compile && $(MAKE) jessie + cd ./packer && $(MAKE) compile && $(MAKE) buster vagrant: vagrant up diff --git a/chroot-script b/chroot-script index 0cb906fb..b8ba9e01 100755 --- a/chroot-script +++ b/chroot-script @@ -112,8 +112,8 @@ chrootmirror() { # add security.debian.org: case "$RELEASE" in - unstable|sid|stretch) ;; # no security pool available - jessie|buster) + unstable|sid) ;; # no security pool available + buster) echo "Adding security.debian.org to sources.list." echo "deb http://security.debian.org ${RELEASE}/updates $COMPONENTS" >> /etc/apt/sources.list ;; @@ -358,13 +358,6 @@ kernel() { $APTUPDATE KVER=$(get_kernel_version) if [ -n "$KVER" ] ; then - case "$RELEASE" in - stretch) - echo "Installing busybox on Debian/$RELEASE as it's essential for the initramfs" - DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL busybox - ;; - esac - KERNELPACKAGES="linux-image-$KVER linux-headers-$KVER firmware-linux-free $INITRD_GENERATOR" # only add firmware-linux if we have non-free as a component if expr "$COMPONENTS" : '.*non-free' >/dev/null ; then diff --git a/config b/config index 4cdf5c53..9b92a56e 100644 --- a/config +++ b/config @@ -73,7 +73,7 @@ # BACKPORTREPOS='yes' # Debian release that should be installed. -# Supported values: jessie, stretch, buster, bullseye, sid +# Supported values: buster, bullseye, sid # Default: 'bullseye' # RELEASE='bullseye' diff --git a/docker/test_dirinstall.bats b/docker/test_dirinstall.bats index 86bd5fa6..174e6295 100644 --- a/docker/test_dirinstall.bats +++ b/docker/test_dirinstall.bats @@ -20,5 +20,5 @@ mountpoint="/srv/debian" @test "debian_version exists and is valid version" { run cat "${mountpoint}/etc/debian_version" [ "$status" -eq 0 ] - [[ "$output" == [0-9].[0-9]* ]] || [[ "$output" == 'stretch/sid' ]] + [[ "$output" == [0-9].[0-9]* ]] || [[ "$output" == 'buster/sid' ]] } diff --git a/docker/test_vminstall.bats b/docker/test_vminstall.bats index 95254b43..b0383b4d 100644 --- a/docker/test_vminstall.bats +++ b/docker/test_vminstall.bats @@ -35,5 +35,5 @@ teardown() { @test "debian_version exists and is valid version" { run cat "${mountpath}/etc/debian_version" [ "$status" -eq 0 ] - [[ "$output" == [0-9].[0-9]* ]] || [[ "$output" == 'stretch/sid' ]] + [[ "$output" == [0-9].[0-9]* ]] || [[ "$output" == 'buster/sid' ]] } diff --git a/grml-debootstrap b/grml-debootstrap index 08797791..828969ee 100755 --- a/grml-debootstrap +++ b/grml-debootstrap @@ -616,7 +616,7 @@ done [ "$_opt_contrib" ] && COMPONENTS="$COMPONENTS contrib" case "${RELEASE}" in - jessie|stretch|buster|bullseye) + buster|bullseye) [ "$_opt_non_free" ] && COMPONENTS="$COMPONENTS non-free" ;; *) @@ -1295,21 +1295,7 @@ mkfs() { fi case "$RELEASE" in - jessie) - if [ "$mkfs_supports_metadata_csum" = 1 ]; then - einfo "Disabling $MKFS feature as OS Release $RELEASE does not support it: metadata_csum" - MKFS_OPTS="$MKFS_OPTS -O ^metadata_csum" - fi - if [ "$mkfs_supports_metadata_csum_seed" = 1 ]; then - einfo "Disabling $MKFS feature as OS Release $RELEASE does not support it: metadata_csum_seed" - MKFS_OPTS="$MKFS_OPTS -O ^metadata_csum_seed" - fi - if [ "$mkfs_supports_orphan_file" = 1 ]; then - einfo "Disabling $MKFS feature as OS Release $RELEASE does not support it: orphan_file" - MKFS_OPTS="$MKFS_OPTS -O ^orphan_file" - fi - ;; - bullseye|buster|stretch) + bullseye|buster) if [ "$mkfs_supports_metadata_csum_seed" = 1 ]; then einfo "Disabling $MKFS feature as OS Release $RELEASE does not support it: metadata_csum_seed" MKFS_OPTS="$MKFS_OPTS -O ^metadata_csum_seed" @@ -1688,14 +1674,6 @@ grub_install() { clean_chroot "${MNTPOINT}" update-grub clean_chroot "${MNTPOINT}" sync - case "$RELEASE" in - jessie) - einfo "Applying workaround for GRUB font path bug in jessie (Debian #787685)." - mkdir -p "${MNTPOINT}/boot/grub/fonts/" - cp "${MNTPOINT}/usr/share/grub/unicode.pf2" "${MNTPOINT}/boot/grub/fonts/" - ;; - esac - if grep -q '^GRUB_DISABLE_LINUX_UUID=.*true' "${MNTPOINT}"/etc/default/grub 2>/dev/null ; then ewarn "GRUB_DISABLE_LINUX_UUID is set to true in /etc/default/grub, not adjusting root= in grub.cfg." ewarn "Please note that your system might NOT be able to properly boot." diff --git a/grml-debootstrap.8.txt b/grml-debootstrap.8.txt index 60da9f35..ba54f96a 100644 --- a/grml-debootstrap.8.txt +++ b/grml-debootstrap.8.txt @@ -219,7 +219,7 @@ Options and environment variables *-r*, *--release* _releasename_:: Specify release of new Debian system. Supported releases names: - jessie, stretch, buster, bullseye, bookworm and sid. + buster, bullseye, bookworm and sid. Corresponding with configuration variable RELEASE. Default release: bookworm *--remove-configs*:: @@ -301,9 +301,9 @@ Usage examples Install default Debian release (bookworm) on /dev/sda1 and install bootmanager GRUB in MBR (master boot record) of /dev/sda. - grml-debootstrap --release stretch --target /dev/sda1 --grub /dev/sda --hostname debian01 --password changeme + grml-debootstrap --release buster --target /dev/sda1 --grub /dev/sda --hostname debian01 --password changeme -Install Debian release stretch on /dev/sda1 and install bootmanager GRUB in MBR (master boot record) of /dev/sda. +Install Debian release buster on /dev/sda1 and install bootmanager GRUB in MBR (master boot record) of /dev/sda. Set hostname to 'debian01' and password for user root to 'changeme'. grml-debootstrap --target /dev/sda6 --grub /dev/sda --release sid @@ -393,9 +393,9 @@ Supported Releases include::releasetable.txt[] [NOTE] -.jessie/stretch/buster release +.buster release ================================================================================ -[1] Please notice that releases like jessie, stretch and buster are unsupported releases within Debian nowadays. +[1] Please notice that releases like buster are unsupported releases within Debian nowadays. grml-debootstrap can handle the releases but you really should not use them anymore unless you really know what you are doing. Even older versions are also entirely unsupported by grml-debootstrap. diff --git a/packer/Makefile b/packer/Makefile index 8a79a1e5..5d37c0f0 100644 --- a/packer/Makefile +++ b/packer/Makefile @@ -37,13 +37,5 @@ bullseye: clean fake-uname.so install buster: clean fake-uname.so install packer build -var debian_version=$@ -var grml_debootstrap_version=$(GRML_DEBOOTSTRAP_VERSION) -var grml_debootstrap_local_path=$(GRML_DEBOOTSTRAP_LOCAL_PATH) debian64.json -# Debian 9 -stretch: clean fake-uname.so install - packer build -var debian_version=$@ -var grml_debootstrap_version=$(GRML_DEBOOTSTRAP_VERSION) -var grml_debootstrap_local_path=$(GRML_DEBOOTSTRAP_LOCAL_PATH) debian64.json - -# Debian 8 -jessie: clean fake-uname.so install - packer build -var debian_version=$@ -var grml_debootstrap_version=$(GRML_DEBOOTSTRAP_VERSION) -var grml_debootstrap_local_path=$(GRML_DEBOOTSTRAP_LOCAL_PATH) debian64.json - -.PHONY: compile bullseye buster stretch jessie +.PHONY: compile bullseye buster .NOTPARALLEL: diff --git a/packer/debian64_provision.sh b/packer/debian64_provision.sh index 480df1c2..94e13ebc 100644 --- a/packer/debian64_provision.sh +++ b/packer/debian64_provision.sh @@ -202,7 +202,7 @@ grml_debootstrap_execution() { apply_nic_workaround() { # release specific stuff case "$DEBIAN_VERSION" in - stretch|buster|bullseye|bookworm|unstable|sid) + buster|bullseye|bookworm|unstable|sid) ;; *) echo "* Debian $DEBIAN_VERSION doesn't require NIC workaround" diff --git a/releasetable.txt b/releasetable.txt index d085c86c..32b31593 100644 --- a/releasetable.txt +++ b/releasetable.txt @@ -2,8 +2,6 @@ [width="40%",frame="topbot",options="header"] |====================== |Release |Status -|jessie |works[1] -|stretch |works[1] |buster |works[1] |bullseye |works |bookworm |works diff --git a/tests/docker-build-vm.sh b/tests/docker-build-vm.sh index 4b73dbc9..e92606b9 100755 --- a/tests/docker-build-vm.sh +++ b/tests/docker-build-vm.sh @@ -22,10 +22,6 @@ fi set -x case "${RELEASE:-}" in - stretch) - MIRROR='http://archive.debian.org/debian' - EXTRAOPT=--debopt=--no-check-gpg - ;; *) MIRROR='http://deb.debian.org/debian' EXTRAOPT=''