From a69db2ef0dcdb619a5a519baeb7be6811c237241 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 20 May 2025 17:22:11 +0200 Subject: [PATCH] deb: remove ubuntu 20.04 "focal", as it reached EOL Ubuntu 20.04 reached end of support on April 30. There's still commercial ESM (Extended Security Maintenance) support, but we don't account for that in our packages; https://ubuntu.com/blog/ubuntu-20-04-eol-for-devicesional Signed-off-by: Sebastiaan van Stijn --- .github/workflows/ci.yml | 1 - Jenkinsfile | 1 - Makefile | 2 +- deb/Makefile | 2 +- deb/README.md | 2 +- deb/ubuntu-focal/Dockerfile | 46 ------------------------------------- 6 files changed, 3 insertions(+), 51 deletions(-) delete mode 100644 deb/ubuntu-focal/Dockerfile diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a1a0d9f51a..73c55bf338 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,6 @@ jobs: - debian-bullseye - debian-bookworm - debian-trixie - - ubuntu-focal - ubuntu-jammy - ubuntu-noble - ubuntu-oracular diff --git a/Jenkinsfile b/Jenkinsfile index 42ea7277d7..d0f59d41fa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,6 @@ def pkgs = [ [target: "fedora-42", image: "fedora:42", arches: ["amd64", "aarch64"]], // EOL: May 13, 2026 [target: "raspbian-bullseye", image: "balenalib/rpi-raspbian:bullseye", arches: ["armhf"]], // Debian/Raspbian 11 (stable) [target: "raspbian-bookworm", image: "balenalib/rpi-raspbian:bookworm", arches: ["armhf"]], // Debian/Raspbian 12 (next stable) - [target: "ubuntu-focal", image: "ubuntu:focal", arches: ["amd64", "aarch64", "armhf"]], // Ubuntu 20.04 LTS (End of support: April, 2025. EOL: April, 2030) [target: "ubuntu-jammy", image: "ubuntu:jammy", arches: ["amd64", "aarch64", "armhf"]], // Ubuntu 22.04 LTS (End of support: June, 2027. EOL: April, 2032) [target: "ubuntu-noble", image: "ubuntu:noble", arches: ["amd64", "aarch64", "armhf"]], // Ubuntu 24.04 LTS (End of support: June, 2029. EOL: April, 2034) [target: "ubuntu-oracular", image: "ubuntu:oracular", arches: ["amd64", "aarch64", "armhf"]], // Ubuntu 24.10 (EOL: July, 2025) diff --git a/Makefile b/Makefile index 1b867b28c8..8beb5b2f7c 100644 --- a/Makefile +++ b/Makefile @@ -99,7 +99,7 @@ static: checkout ## build static-compiled packages .PHONY: verify verify: ## verify installation of packages -# to verify using packages from staging, use: make VERIFY_PACKAGE_REPO=stage IMAGE=ubuntu:focal verify +# to verify using packages from staging, use: make VERIFY_PACKAGE_REPO=stage IMAGE=ubuntu:noble verify docker run $(VERIFY_PLATFORM) --rm -i \ -v "$$(pwd):/v" \ -e DEBIAN_FRONTEND=noninteractive \ diff --git a/deb/Makefile b/deb/Makefile index af3c1e3d84..f1424067ef 100644 --- a/deb/Makefile +++ b/deb/Makefile @@ -54,7 +54,7 @@ RUN?=docker run --rm \ debbuild-$@/$(ARCH) DEBIAN_VERSIONS ?= debian-bullseye debian-bookworm debian-trixie -UBUNTU_VERSIONS ?= ubuntu-focal ubuntu-jammy ubuntu-noble ubuntu-oracular ubuntu-plucky +UBUNTU_VERSIONS ?= ubuntu-jammy ubuntu-noble ubuntu-oracular ubuntu-plucky RASPBIAN_VERSIONS ?= raspbian-bullseye raspbian-bookworm DISTROS := $(DEBIAN_VERSIONS) $(UBUNTU_VERSIONS) $(RASPBIAN_VERSIONS) diff --git a/deb/README.md b/deb/README.md index e63acdc337..229fb70bdb 100644 --- a/deb/README.md +++ b/deb/README.md @@ -29,7 +29,7 @@ make ubuntu ## Specifying a specific distro version ```shell -make ubuntu-focal +make ubuntu-noble ``` ## Building the for all distros diff --git a/deb/ubuntu-focal/Dockerfile b/deb/ubuntu-focal/Dockerfile deleted file mode 100644 index dbca943097..0000000000 --- a/deb/ubuntu-focal/Dockerfile +++ /dev/null @@ -1,46 +0,0 @@ -# syntax=docker/dockerfile:1 - -ARG GO_IMAGE=golang:latest -ARG DISTRO=ubuntu -ARG SUITE=focal -ARG VERSION_ID=20.04 -ARG BUILD_IMAGE=${DISTRO}:${SUITE} - -FROM ${GO_IMAGE} AS golang - -FROM ${BUILD_IMAGE} - -# Remove diverted man binary to prevent man-pages being replaced with "minimized" message. See docker/for-linux#639 -RUN if [ "$(dpkg-divert --truename /usr/bin/man)" = "/usr/bin/man.REAL" ]; then \ - rm -f /usr/bin/man; \ - dpkg-divert --quiet --remove --rename /usr/bin/man; \ - fi - -ARG DEBIAN_FRONTEND=noninteractive -RUN apt-get update && apt-get install -y curl devscripts equivs git - -ENV GOPROXY=https://proxy.golang.org|direct -ENV GO111MODULE=off -ENV GOPATH=/go -ENV GOTOOLCHAIN=local -ENV PATH=$PATH:/usr/local/go/bin:$GOPATH/bin - -ARG COMMON_FILES -COPY --link ${COMMON_FILES} /root/build-deb/debian -RUN apt-get update \ - && mk-build-deps -t "apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y" -i /root/build-deb/debian/control - -COPY --link sources/ /sources -ARG DISTRO -ARG SUITE -ARG VERSION_ID -ENV DISTRO=${DISTRO} -ENV SUITE=${SUITE} -ENV VERSION_ID=${VERSION_ID} - -COPY --link --from=golang /usr/local/go /usr/local/go - -WORKDIR /root/build-deb -COPY build-deb /root/build-deb/build-deb - -ENTRYPOINT ["/root/build-deb/build-deb"]