Skip to content

Commit bc3d223

Browse files
learmjlearmj
authored
Merge pull request #69 from learmj/trixie_dev
Debian: Add trixie support
2 parents e67cf57 + e5766aa commit bc3d223

File tree

12 files changed

+207
-3
lines changed

12 files changed

+207
-3
lines changed

‎config/generic64-apt-ab.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ system_part_size=300%
88

99
[device]
1010
class=pi5
11-
profile=bookworm/apt-min64
11+
profile=debian/bookworm/apt-min64

‎config/generic64-apt-simple.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ name=deb12-arm64-min
99

1010
[device]
1111
class=pi5
12-
profile=bookworm/apt-min64
12+
profile=debian/bookworm/apt-min64

‎config/trixie64-apt-simple.cfg‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Generic minimal arm64 trixie system with apt, a small handful of utils and
2+
# an RPiOS style partition layout
3+
4+
[image]
5+
layout=mbr/simple_dual
6+
boot_part_size=200%
7+
root_part_size=300%
8+
name=deb13-arm64-min
9+
10+
[device]
11+
class=pi5
12+
profile=debian/trixie/apt-min64

‎examples/nested_image/config/nested.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ name=nested-example
44

55
[device]
66
class=pi5
7-
profile=bookworm/apt-min64
7+
profile=debian/bookworm/apt-min64

‎meta/app-container/docker/engine-trixie.yaml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
---
2+
name: docker-engine
3+
mmdebstrap:
4+
architectures:
5+
- arm64
6+
mirrors:
7+
- deb https://download.docker.com/linux/debian trixie stable
8+
setup-hooks:
9+
- mkdir -p $1/usr/share/keyrings/
10+
- curl -fsSL https://download.docker.com/linux/debian/gpg -o $1/usr/share/keyrings/docker.asc
11+
- chmod a+r $1/usr/share/keyrings/docker.asc
12+
- cp -p $1/usr/share/keyrings/docker.asc $IGconf_sys_apt_keydir
13+
packages:
14+
- docker-ce
15+
- docker-ce-cli
16+
- containerd.io
17+
- docker-buildx-plugin
18+
- docker-compose-plugin
19+
customize-hooks:
20+
- mkdir -p $1/etc/apt/sources.list.d
21+
- |-
22+
cat <<- EOF > $1/etc/apt/sources.list.d/docker.list
23+
deb [arch=arm64 signed-by=/usr/share/keyrings/docker.asc] https://download.docker.com/linux/debian trixie stable
24+
EOF
25+
- sed -i '/download\.docker\.com/d' $1/etc/apt/sources.list
26+
- chroot $1 sh -c "groupadd -f -r docker"

‎meta/debian/trixie/arm64/base-apt-multi.yaml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
---
2+
name: trixie-arm64-multi
3+
mmdebstrap:
4+
architectures:
5+
- arm64 armhf
6+
mode: auto
7+
variant: apt
8+
suite: trixie
9+
mirrors:
10+
- deb http://deb.debian.org/debian trixie main contrib non-free non-free-firmware
11+
- deb http://deb.debian.org/debian-security trixie-security main contrib non-free non-free-firmware
12+
- deb http://deb.debian.org/debian trixie-updates main contrib non-free non-free-firmware
13+
packages:
14+
- login
15+
- linux-sysctl-defaults
16+
essential-hooks:
17+
- echo tzdata tzdata/Areas select "$IGconf_device_timezone_area"
18+
| chroot $1 debconf-set-selections
19+
- echo tzdata tzdata/Zones/$IGconf_device_timezone_area select "$IGconf_device_timezone_city"
20+
| chroot $1 debconf-set-selections
21+
- echo locales locales/locales_to_be_generated multiselect "$IGconf_device_locale1"
22+
| chroot $1 debconf-set-selections
23+
- echo locales locales/default_environment_locale select "$IGconf_device_locale1"
24+
| chroot $1 debconf-set-selections
25+
- echo keyboard-configuration keyboard-configuration/variant select "$IGconf_device_keyboard_layout"
26+
| chroot $1 debconf-set-selections
27+
- echo keyboard-configuration keyboard-configuration/xkb-keymap select "$IGconf_device_keyboard_keymap"
28+
| chroot $1 debconf-set-selections
29+
aptopts:
30+
- APT::Install-Suggests "false"
31+
- APT::Install-Recommends "false"
32+
dpkgopts:
33+
- path-exclude=/usr/share/man/*
34+
- path-include=/usr/share/man/man[1-9]/*
35+
- path-exclude=/usr/share/locale/*
36+
- path-include=/usr/share/locale/locale.alias
37+
- path-exclude=/usr/share/doc/*
38+
- path-include=/usr/share/doc/*/copyright
39+
- path-include=/usr/share/doc/*/changelog.Debian.*
40+
- path-exclude=/usr/share/{doc,info,man,omf,help,gnome/help}/*
41+
- path-exclude=/usr/share/lintian/*

‎meta/debian/trixie/arm64/base-apt.yaml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
---
2+
name: trixie-arm64
3+
mmdebstrap:
4+
architectures:
5+
- arm64
6+
mode: auto
7+
variant: apt
8+
suite: trixie
9+
mirrors:
10+
- deb http://deb.debian.org/debian trixie main contrib non-free non-free-firmware
11+
- deb http://deb.debian.org/debian-security trixie-security main contrib non-free non-free-firmware
12+
- deb http://deb.debian.org/debian trixie-updates main contrib non-free non-free-firmware
13+
packages:
14+
- login
15+
- linux-sysctl-defaults
16+
essential-hooks:
17+
- echo tzdata tzdata/Areas select "$IGconf_device_timezone_area"
18+
| chroot $1 debconf-set-selections
19+
- echo tzdata tzdata/Zones/$IGconf_device_timezone_area select "$IGconf_device_timezone_city"
20+
| chroot $1 debconf-set-selections
21+
- echo locales locales/locales_to_be_generated multiselect "$IGconf_device_locale1"
22+
| chroot $1 debconf-set-selections
23+
- echo locales locales/default_environment_locale select "$IGconf_device_locale1"
24+
| chroot $1 debconf-set-selections
25+
- echo keyboard-configuration keyboard-configuration/variant select "$IGconf_device_keyboard_layout"
26+
| chroot $1 debconf-set-selections
27+
- echo keyboard-configuration keyboard-configuration/xkb-keymap select "$IGconf_device_keyboard_keymap"
28+
| chroot $1 debconf-set-selections
29+
aptopts:
30+
- APT::Install-Suggests "false"
31+
- APT::Install-Recommends "false"
32+
dpkgopts:
33+
- path-exclude=/usr/share/man/*
34+
- path-include=/usr/share/man/man[1-9]/*
35+
- path-exclude=/usr/share/locale/*
36+
- path-include=/usr/share/locale/locale.alias
37+
- path-exclude=/usr/share/doc/*
38+
- path-include=/usr/share/doc/*/copyright
39+
- path-include=/usr/share/doc/*/changelog.Debian.*
40+
- path-exclude=/usr/share/{doc,info,man,omf,help,gnome/help}/*
41+
- path-exclude=/usr/share/lintian/*

‎meta/debian/trixie/arm64/base-slim.yaml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
---
2+
name: trixie-arm64-slim
3+
mmdebstrap:
4+
architectures:
5+
- arm64
6+
mode: auto
7+
variant: custom
8+
suite: trixie
9+
mirrors:
10+
- deb http://deb.debian.org/debian trixie main contrib non-free non-free-firmware
11+
- deb http://deb.debian.org/debian-security trixie-security main contrib non-free non-free-firmware
12+
- deb http://deb.debian.org/debian trixie-updates main contrib non-free non-free-firmware
13+
packages:
14+
- findutils
15+
- dpkg
16+
- libc-bin
17+
- base-files
18+
- base-passwd
19+
- debianutils
20+
- bash
21+
- diffutils
22+
- util-linux
23+
- sed
24+
- grep
25+
- gzip
26+
- udev
27+
- e2fsprogs
28+
- login
29+
- linux-sysctl-defaults
30+
setup-hooks:
31+
- mkdir -p $1/usr/bin
32+
- ln -s bash $1/usr/bin/sh
33+
essential-hooks:
34+
- echo tzdata tzdata/Areas select "$IGconf_device_timezone_area"
35+
| chroot $1 debconf-set-selections
36+
- echo tzdata tzdata/Zones/$IGconf_device_timezone_area select "$IGconf_device_timezone_city"
37+
| chroot $1 debconf-set-selections
38+
- echo locales locales/locales_to_be_generated multiselect "$IGconf_device_locale1"
39+
| chroot $1 debconf-set-selections
40+
- echo locales locales/default_environment_locale select "$IGconf_device_locale1"
41+
| chroot $1 debconf-set-selections
42+
- echo keyboard-configuration keyboard-configuration/variant select "$IGconf_device_keyboard_layout"
43+
| chroot $1 debconf-set-selections
44+
- echo keyboard-configuration keyboard-configuration/xkb-keymap select "$IGconf_device_keyboard_keymap"
45+
| chroot $1 debconf-set-selections
46+
aptopts:
47+
- APT::Install-Suggests "false"
48+
- APT::Install-Recommends "false"
49+
dpkgopts:
50+
- path-exclude=/usr/share/man/*
51+
- path-include=/usr/share/man/man[1-9]/*
52+
- path-exclude=/usr/share/locale/*
53+
- path-include=/usr/share/locale/locale.alias
54+
- path-exclude=/usr/share/doc/*
55+
- path-include=/usr/share/doc/*/copyright
56+
- path-include=/usr/share/doc/*/changelog.Debian.*
57+
- path-exclude=/usr/share/{doc,info,man,omf,help,gnome/help}/*
58+
- path-exclude=/usr/share/lintian/*

‎meta/rpi/debian/trixie/apt.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
name: debian-trixie-rpi
3+
mmdebstrap:
4+
mirrors:
5+
- deb http://archive.raspberrypi.com/debian trixie main
6+
packages:
7+
- raspberrypi-archive-keyring
8+
customize-hooks:
9+
- test -f $1/usr/share/keyrings/raspberrypi-archive-keyring.gpg || false
10+
- mkdir -p $1/etc/apt/sources.list.d
11+
- |-
12+
cat <<- EOF > $1/etc/apt/sources.list.d/raspberrypi.list
13+
deb [signed-by=/usr/share/keyrings/raspberrypi-archive-keyring.gpg] http://archive.raspberrypi.com/debian trixie main
14+
EOF
15+
- sed -i '/archive\.raspberrypi\.com/d' $1/etc/apt/sources.list

‎profile/bookworm/apt-min-docker64‎ renamed to ‎profile/debian/bookworm/apt-min-docker64‎

File renamed without changes.

0 commit comments

Comments
 (0)