From 2a63aa7af21400caa33fb69ff0280c4dc386cf05 Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Sun, 8 Jun 2025 21:27:28 +0200 Subject: [PATCH 1/3] distro: remove debian 10 Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- Makefile | 2 +- common/packages.hcl | 11 ----------- common/packages.mk | 11 +---------- 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/Makefile b/Makefile index 7bb1c7a6..a4b24601 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ include common/packages.mk GHA_MATRIX ?= minimal ifeq ($(GHA_MATRIX),minimal) - GHA_RELEASES := debian10 debian11 debian12 ubuntu2004 ubuntu2204 centos9 oraclelinux9 fedora39 static + GHA_RELEASES := debian11 debian12 ubuntu2004 ubuntu2204 centos9 oraclelinux9 fedora39 static else ifeq ($(GHA_MATRIX),all) GHA_RELEASES := $(PKG_DEB_RELEASES) $(PKG_RPM_RELEASES) static else diff --git a/common/packages.hcl b/common/packages.hcl index ea8e5567..3d4fd4aa 100644 --- a/common/packages.hcl +++ b/common/packages.hcl @@ -64,17 +64,6 @@ target "_pkg-alpine316" { } } -target "_pkg-debian10" { - args = { - PKG_RELEASE = "debian10" - PKG_TYPE = "deb" - PKG_DISTRO = "debian" - PKG_DISTRO_ID = "10" - PKG_DISTRO_SUITE = "buster" - PKG_BASE_IMAGE = "debian:buster" - } -} - target "_pkg-debian11" { args = { PKG_RELEASE = "debian11" diff --git a/common/packages.mk b/common/packages.mk index 62238b45..a07a00c2 100644 --- a/common/packages.mk +++ b/common/packages.mk @@ -15,7 +15,7 @@ # don't forget to add/update pkg-info-* rule and update packages.hcl as well # if you add a new release PKG_APK_RELEASES ?= alpine314 alpine315 alpine316 -PKG_DEB_RELEASES ?= debian10 debian11 debian12 ubuntu2004 ubuntu2204 raspbian10 raspbian11 raspbian12 +PKG_DEB_RELEASES ?= debian11 debian12 ubuntu2004 ubuntu2204 raspbian10 raspbian11 raspbian12 PKG_RPM_RELEASES ?= centos9 fedora37 fedora38 fedora39 oraclelinux8 oraclelinux9 # PKG_SUPPORTED_PLATFORMS could be replaced by: @@ -64,15 +64,6 @@ pkg-info-alpine316: $(eval PKG_BASE_IMAGE = alpine:3.16) $(eval PKG_SUPPORTED_PLATFORMS = linux/386 linux/amd64 linux/arm64 linux/arm/v7 linux/arm/v6 linux/arm/v5 linux/ppc64le linux/s390x) -.PHONY: pkg-info-debian10 -pkg-info-debian10: - $(eval PKG_TYPE = deb) - $(eval PKG_DISTRO = debian) - $(eval PKG_DISTRO_ID = 10) - $(eval PKG_DISTRO_SUITE = buster) - $(eval PKG_BASE_IMAGE = debian:buster) - $(eval PKG_SUPPORTED_PLATFORMS = linux/386 linux/amd64 linux/arm64 linux/arm/v7) - .PHONY: pkg-info-debian11 pkg-info-debian11: $(eval PKG_TYPE = deb) From a9b00633fe4c1877f34c9de1c7cb111d8558049d Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Sun, 8 Jun 2025 21:28:10 +0200 Subject: [PATCH 2/3] distro: remove raspbian 10 Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- common/packages.hcl | 11 ----------- common/packages.mk | 11 +---------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/common/packages.hcl b/common/packages.hcl index 3d4fd4aa..fc65073b 100644 --- a/common/packages.hcl +++ b/common/packages.hcl @@ -86,17 +86,6 @@ target "_pkg-debian12" { } } -target "_pkg-raspbian10" { - args = { - PKG_RELEASE = "raspbian10" - PKG_TYPE = "deb" - PKG_DISTRO = "raspbian" - PKG_DISTRO_ID = "10" - PKG_DISTRO_SUITE = "buster" - PKG_BASE_IMAGE = "balenalib/rpi-raspbian:buster" - } -} - target "_pkg-raspbian11" { args = { PKG_RELEASE = "raspbian11" diff --git a/common/packages.mk b/common/packages.mk index a07a00c2..bb3cdbee 100644 --- a/common/packages.mk +++ b/common/packages.mk @@ -15,7 +15,7 @@ # don't forget to add/update pkg-info-* rule and update packages.hcl as well # if you add a new release PKG_APK_RELEASES ?= alpine314 alpine315 alpine316 -PKG_DEB_RELEASES ?= debian11 debian12 ubuntu2004 ubuntu2204 raspbian10 raspbian11 raspbian12 +PKG_DEB_RELEASES ?= debian11 debian12 ubuntu2004 ubuntu2204 raspbian11 raspbian12 PKG_RPM_RELEASES ?= centos9 fedora37 fedora38 fedora39 oraclelinux8 oraclelinux9 # PKG_SUPPORTED_PLATFORMS could be replaced by: @@ -82,15 +82,6 @@ pkg-info-debian12: $(eval PKG_BASE_IMAGE = debian:bookworm) $(eval PKG_SUPPORTED_PLATFORMS = linux/386 linux/amd64 linux/arm64 linux/arm/v5 linux/arm/v6 linux/arm/v7 linux/mips64le linux/ppc64le linux/s390x) -.PHONY: pkg-info-raspbian10 -pkg-info-raspbian10: - $(eval PKG_TYPE = deb) - $(eval PKG_DISTRO = raspbian) - $(eval PKG_DISTRO_ID = 10) - $(eval PKG_DISTRO_SUITE = buster) - $(eval PKG_BASE_IMAGE = balenalib/rpi-raspbian:buster) - $(eval PKG_SUPPORTED_PLATFORMS = linux/arm/v7) - .PHONY: pkg-info-raspbian11 pkg-info-raspbian11: $(eval PKG_TYPE = deb) From a57a18bd232b726b1e089de7fdd7687b8dfc0019 Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Sun, 8 Jun 2025 21:32:57 +0200 Subject: [PATCH 3/3] distro: add debian 13 Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- Makefile | 2 +- common/packages.hcl | 11 +++++++++++ common/packages.mk | 11 ++++++++++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a4b24601..0835e2e2 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ include common/packages.mk GHA_MATRIX ?= minimal ifeq ($(GHA_MATRIX),minimal) - GHA_RELEASES := debian11 debian12 ubuntu2004 ubuntu2204 centos9 oraclelinux9 fedora39 static + GHA_RELEASES := debian11 debian12 debian13 ubuntu2004 ubuntu2204 centos9 oraclelinux9 fedora39 static else ifeq ($(GHA_MATRIX),all) GHA_RELEASES := $(PKG_DEB_RELEASES) $(PKG_RPM_RELEASES) static else diff --git a/common/packages.hcl b/common/packages.hcl index fc65073b..e5b14ca1 100644 --- a/common/packages.hcl +++ b/common/packages.hcl @@ -86,6 +86,17 @@ target "_pkg-debian12" { } } +target "_pkg-debian13" { + args = { + PKG_RELEASE = "debian13" + PKG_TYPE = "deb" + PKG_DISTRO = "debian" + PKG_DISTRO_ID = "13" + PKG_DISTRO_SUITE = "trixie" + PKG_BASE_IMAGE = "debian:trixie" + } +} + target "_pkg-raspbian11" { args = { PKG_RELEASE = "raspbian11" diff --git a/common/packages.mk b/common/packages.mk index bb3cdbee..d7b626dd 100644 --- a/common/packages.mk +++ b/common/packages.mk @@ -15,7 +15,7 @@ # don't forget to add/update pkg-info-* rule and update packages.hcl as well # if you add a new release PKG_APK_RELEASES ?= alpine314 alpine315 alpine316 -PKG_DEB_RELEASES ?= debian11 debian12 ubuntu2004 ubuntu2204 raspbian11 raspbian12 +PKG_DEB_RELEASES ?= debian11 debian12 debian13 ubuntu2004 ubuntu2204 raspbian11 raspbian12 PKG_RPM_RELEASES ?= centos9 fedora37 fedora38 fedora39 oraclelinux8 oraclelinux9 # PKG_SUPPORTED_PLATFORMS could be replaced by: @@ -82,6 +82,15 @@ pkg-info-debian12: $(eval PKG_BASE_IMAGE = debian:bookworm) $(eval PKG_SUPPORTED_PLATFORMS = linux/386 linux/amd64 linux/arm64 linux/arm/v5 linux/arm/v6 linux/arm/v7 linux/mips64le linux/ppc64le linux/s390x) +.PHONY: pkg-info-debian13 +pkg-info-debian13: + $(eval PKG_TYPE = deb) + $(eval PKG_DISTRO = debian) + $(eval PKG_DISTRO_ID = 13) + $(eval PKG_DISTRO_SUITE = trixie) + $(eval PKG_BASE_IMAGE = debian:trixie) + $(eval PKG_SUPPORTED_PLATFORMS = linux/386 linux/amd64 linux/arm64 linux/arm/v5 linux/arm/v6 linux/arm/v7 linux/mips64le linux/ppc64le linux/riscv64 linux/s390x) + .PHONY: pkg-info-raspbian11 pkg-info-raspbian11: $(eval PKG_TYPE = deb)