Skip to content

Commit 8d99dfb

Browse files
authored
Merge pull request #206 from crazy-max/update-debian
distro: add debian 13
2 parents cdc9a48 + a57a18b commit 8d99dfb

File tree

3 files changed

+15
-35
lines changed

3 files changed

+15
-35
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ include common/packages.mk
4040

4141
GHA_MATRIX ?= minimal
4242
ifeq ($(GHA_MATRIX),minimal)
43-
GHA_RELEASES := debian10 debian11 debian12 ubuntu2004 ubuntu2204 centos9 oraclelinux9 fedora39 static
43+
GHA_RELEASES := debian11 debian12 debian13 ubuntu2004 ubuntu2204 centos9 oraclelinux9 fedora39 static
4444
else ifeq ($(GHA_MATRIX),all)
4545
GHA_RELEASES := $(PKG_DEB_RELEASES) $(PKG_RPM_RELEASES) static
4646
else

common/packages.hcl

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -64,17 +64,6 @@ target "_pkg-alpine316" {
6464
}
6565
}
6666

67-
target "_pkg-debian10" {
68-
args = {
69-
PKG_RELEASE = "debian10"
70-
PKG_TYPE = "deb"
71-
PKG_DISTRO = "debian"
72-
PKG_DISTRO_ID = "10"
73-
PKG_DISTRO_SUITE = "buster"
74-
PKG_BASE_IMAGE = "debian:buster"
75-
}
76-
}
77-
7867
target "_pkg-debian11" {
7968
args = {
8069
PKG_RELEASE = "debian11"
@@ -97,14 +86,14 @@ target "_pkg-debian12" {
9786
}
9887
}
9988

100-
target "_pkg-raspbian10" {
89+
target "_pkg-debian13" {
10190
args = {
102-
PKG_RELEASE = "raspbian10"
91+
PKG_RELEASE = "debian13"
10392
PKG_TYPE = "deb"
104-
PKG_DISTRO = "raspbian"
105-
PKG_DISTRO_ID = "10"
106-
PKG_DISTRO_SUITE = "buster"
107-
PKG_BASE_IMAGE = "balenalib/rpi-raspbian:buster"
93+
PKG_DISTRO = "debian"
94+
PKG_DISTRO_ID = "13"
95+
PKG_DISTRO_SUITE = "trixie"
96+
PKG_BASE_IMAGE = "debian:trixie"
10897
}
10998
}
11099

common/packages.mk

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# don't forget to add/update pkg-info-* rule and update packages.hcl as well
1616
# if you add a new release
1717
PKG_APK_RELEASES ?= alpine314 alpine315 alpine316
18-
PKG_DEB_RELEASES ?= debian10 debian11 debian12 ubuntu2004 ubuntu2204 raspbian10 raspbian11 raspbian12
18+
PKG_DEB_RELEASES ?= debian11 debian12 debian13 ubuntu2004 ubuntu2204 raspbian11 raspbian12
1919
PKG_RPM_RELEASES ?= centos9 fedora37 fedora38 fedora39 oraclelinux8 oraclelinux9
2020

2121
# PKG_SUPPORTED_PLATFORMS could be replaced by:
@@ -64,15 +64,6 @@ pkg-info-alpine316:
6464
$(eval PKG_BASE_IMAGE = alpine:3.16)
6565
$(eval PKG_SUPPORTED_PLATFORMS = linux/386 linux/amd64 linux/arm64 linux/arm/v7 linux/arm/v6 linux/arm/v5 linux/ppc64le linux/s390x)
6666

67-
.PHONY: pkg-info-debian10
68-
pkg-info-debian10:
69-
$(eval PKG_TYPE = deb)
70-
$(eval PKG_DISTRO = debian)
71-
$(eval PKG_DISTRO_ID = 10)
72-
$(eval PKG_DISTRO_SUITE = buster)
73-
$(eval PKG_BASE_IMAGE = debian:buster)
74-
$(eval PKG_SUPPORTED_PLATFORMS = linux/386 linux/amd64 linux/arm64 linux/arm/v7)
75-
7667
.PHONY: pkg-info-debian11
7768
pkg-info-debian11:
7869
$(eval PKG_TYPE = deb)
@@ -91,14 +82,14 @@ pkg-info-debian12:
9182
$(eval PKG_BASE_IMAGE = debian:bookworm)
9283
$(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)
9384

94-
.PHONY: pkg-info-raspbian10
95-
pkg-info-raspbian10:
85+
.PHONY: pkg-info-debian13
86+
pkg-info-debian13:
9687
$(eval PKG_TYPE = deb)
97-
$(eval PKG_DISTRO = raspbian)
98-
$(eval PKG_DISTRO_ID = 10)
99-
$(eval PKG_DISTRO_SUITE = buster)
100-
$(eval PKG_BASE_IMAGE = balenalib/rpi-raspbian:buster)
101-
$(eval PKG_SUPPORTED_PLATFORMS = linux/arm/v7)
88+
$(eval PKG_DISTRO = debian)
89+
$(eval PKG_DISTRO_ID = 13)
90+
$(eval PKG_DISTRO_SUITE = trixie)
91+
$(eval PKG_BASE_IMAGE = debian:trixie)
92+
$(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)
10293

10394
.PHONY: pkg-info-raspbian11
10495
pkg-info-raspbian11:

0 commit comments

Comments
 (0)