Skip to content

Commit b4e91e2

Browse files
committed
Add support for Debian Trixie
1 parent a463215 commit b4e91e2

4 files changed

Lines changed: 28 additions & 1 deletion

File tree

.github/workflows/pkg.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212

1313
jobs:
1414
package:
15-
uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v7
15+
uses: NLnetLabs/ploutos/.github/workflows/pkg-rust.yml@v8
1616
secrets:
1717
DOCKER_HUB_ID: ${{ secrets.DOCKER_HUB_ID }}
1818
DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}

Cargo.toml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,18 @@ copyright = "Copyright (c) 2020, NLnet Labs. All rights reserved."
9191
conf-files = ["/etc/routinator/routinator.conf"]
9292
systemd-units = { unit-name = "routinator", unit-scripts = "pkg/common", enable = true }
9393

94+
[package.metadata.deb.variants.ubuntu-jammy]
95+
systemd-units = { unit-name = "routinator", unit-scripts = "pkg/common", enable = true, usr-merge = false }
96+
97+
[package.metadata.deb.variants.ubuntu-focal]
98+
systemd-units = { unit-name = "routinator", unit-scripts = "pkg/common", enable = true, usr-merge = false }
99+
100+
[package.metadata.deb.variants.debian-buster]
101+
systemd-units = { unit-name = "routinator", unit-scripts = "pkg/common", enable = true, usr-merge = false }
102+
103+
[package.metadata.deb.variants.debian-bullseye]
104+
systemd-units = { unit-name = "routinator", unit-scripts = "pkg/common", enable = true, usr-merge = false }
105+
94106
[package.metadata.deb.variants.minimal]
95107

96108
[package.metadata.generate-rpm]

doc/manual/source/installation.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ to get started.
5050
To install a Routinator package, you need the 64-bit version of one of
5151
these Debian versions:
5252

53+
- Debian Trixie 13
5354
- Debian Bookworm 12
5455
- Debian Bullseye 11
5556

pkg/rules/packages-to-build.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ image:
1010
- "debian:buster" # debian/10
1111
- "debian:bullseye" # debian/11
1212
- "debian:bookworm" # debian/12
13+
- "debian:trixie" # debian/13
1314
- 'almalinux:8' # compatible with EOL centos:8
1415
- 'almalinux:9'
1516
- 'almalinux:10'
@@ -42,6 +43,19 @@ include:
4243
- image: 'almalinux:10'
4344
systemd_service_unit_file: pkg/common/routinator.routinator.service
4445

46+
# package for the Raspberry Pi 4b as an ARMv7 cross compiled variant of the Debian Trixie upon which
47+
# Raspbian 13 is based.
48+
- pkg: 'routinator'
49+
image: 'debian:trixie'
50+
target: 'armv7-unknown-linux-musleabihf'
51+
test-image: 'debian:trixie/armhf'
52+
53+
# package for the Raspberry Pi 4b 64-bit cross compiled variant of the Debian Trixie upon which
54+
# Raspbian 13 is based.
55+
- pkg: 'routinator'
56+
image: 'debian:trixie'
57+
target: 'aarch64-unknown-linux-musl'
58+
4559
# package for the Raspberry Pi 4b as an ARMv7 cross compiled variant of the Debian Bookworm upon which
4660
# Raspbian 12 is based.
4761
- pkg: 'routinator'

0 commit comments

Comments
 (0)