diff --git a/deb/Makefile b/deb/Makefile index 7a709756af..7a168a2bd0 100644 --- a/deb/Makefile +++ b/deb/Makefile @@ -53,9 +53,9 @@ RUN?=docker run --rm \ $(RUN_FLAGS) \ debbuild-$@/$(ARCH) -DEBIAN_VERSIONS ?= debian-bullseye debian-bookworm debian-trixie +DEBIAN_VERSIONS ?= debian-bookworm debian-trixie UBUNTU_VERSIONS ?= ubuntu-jammy ubuntu-noble ubuntu-resolute -RASPBIAN_VERSIONS ?= raspbian-bullseye raspbian-bookworm +RASPBIAN_VERSIONS ?= raspbian-bookworm DISTROS := $(DEBIAN_VERSIONS) $(UBUNTU_VERSIONS) $(RASPBIAN_VERSIONS) .PHONY: help diff --git a/deb/build-deb b/deb/build-deb index 7db2053aff..25d398ffc3 100755 --- a/deb/build-deb +++ b/deb/build-deb @@ -57,10 +57,10 @@ pkgRevision=1 # packaging-only changes (without a corresponding release of the software # that's packaged). # - distro (e.g., "ubuntu") -# - VERSION_ID (e.g. "22.04" or "11") this must be "sortable" to make sure that +# - VERSION_ID (e.g. "22.04" or "12") this must be "sortable" to make sure that # packages are upgraded when upgrading to a newer distro version ("codename" # cannot be used for this, as they're not sorted) -# - SUITE ("codename"), e.g. "jammy" or "bullseye". This is mostly for convenience, +# - SUITE ("codename"), e.g. "jammy" or "bookworm". This is mostly for convenience, # because some places refer to distro versions by codename, others by version. # we prefix the codename with a tilde (~), which effectively excludes it from # version comparison. diff --git a/deb/debian-bullseye/Dockerfile b/deb/debian-bullseye/Dockerfile deleted file mode 100644 index b3844b2d18..0000000000 --- a/deb/debian-bullseye/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -# syntax=docker/dockerfile:1 - -ARG GO_IMAGE=golang:latest -ARG DISTRO=debian -ARG SUITE=bullseye -ARG VERSION_ID=11 -ARG BUILD_IMAGE=${DISTRO}:${SUITE} - -FROM ${GO_IMAGE} AS golang - -FROM ${BUILD_IMAGE} - -RUN apt-get update && apt-get install -y curl devscripts equivs git - -ENV GOPROXY=https://proxy.golang.org|direct -ENV GO111MODULE=on -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"] diff --git a/deb/raspbian-bullseye/Dockerfile b/deb/raspbian-bullseye/Dockerfile deleted file mode 100644 index 80a8ea1f52..0000000000 --- a/deb/raspbian-bullseye/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -# syntax=docker/dockerfile:1 - -ARG GO_IMAGE=golang:latest -ARG DISTRO=raspbian -ARG SUITE=bullseye -ARG VERSION_ID=11 -ARG BUILD_IMAGE=balenalib/rpi-raspbian:${SUITE} - -FROM ${GO_IMAGE} AS golang - -FROM ${BUILD_IMAGE} - -RUN apt-get update && apt-get install -y curl devscripts equivs git - -ENV GOPROXY=https://proxy.golang.org|direct -ENV GO111MODULE=on -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"] diff --git a/distros.json b/distros.json index 06d424e494..61a58e5733 100644 --- a/distros.json +++ b/distros.json @@ -17,15 +17,6 @@ "description": "CentOS Stream 10", "end_of_life": "2030" }, - "debian-bullseye": { - "image": "debian:bullseye", - "arches": [ - "amd64", - "aarch64", - "armhf" - ], - "description": "Debian 11 (oldstable)" - }, "debian-bookworm": { "image": "debian:bookworm", "arches": [