Skip to content

Commit 62eea1a

Browse files
chrngcchrngc
authored
Merge branch 'main' into partsIndex
2 parents 718ed19 + ad54d3f commit 62eea1a

29 files changed

+3780
-7
lines changed

‎cmd/live-installer/install.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,12 @@ func dependencyCheck(targetOs string) error {
105105
"veritysetup": "cryptsetup", // For the veritysetup command
106106
//"sbsign": "sbsigntools", // For the UKI image creation
107107
}
108+
case "debian":
109+
dependencyInfo = map[string]string{
110+
"mmdebstrap": "mmdebstrap", // For the chroot env build
111+
"mkfs.fat": "dosfstools", // For the FAT32 boot partition creation
112+
"veritysetup": "cryptsetup", // For the veritysetup command
113+
}
108114
default:
109115
return fmt.Errorf("unsupported target OS for dependency check: %s", targetOs)
110116
}

‎cmd/os-image-composer/build.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"github.com/open-edge-platform/os-image-composer/internal/config"
1010
"github.com/open-edge-platform/os-image-composer/internal/provider"
1111
"github.com/open-edge-platform/os-image-composer/internal/provider/azl"
12+
"github.com/open-edge-platform/os-image-composer/internal/provider/debian13"
1213
"github.com/open-edge-platform/os-image-composer/internal/provider/elxr"
1314
"github.com/open-edge-platform/os-image-composer/internal/provider/emt"
1415
"github.com/open-edge-platform/os-image-composer/internal/provider/rcd"
@@ -173,6 +174,10 @@ func InitProvider(os, dist, arch string) (provider.Provider, error) {
173174
if err := azl.Register(os, dist, arch); err != nil {
174175
return nil, fmt.Errorf("registering azl provider failed: %v", err)
175176
}
177+
case debian13.OsName:
178+
if err := debian13.Register(os, dist, arch); err != nil {
179+
return nil, fmt.Errorf("registering debian13 provider failed: %v", err)
180+
}
176181
case emt.OsName:
177182
if err := emt.Register(os, dist, arch); err != nil {
178183
return nil, fmt.Errorf("registering emt provider failed: %v", err)

‎config/osv/debian/debian13/chrootenvconfigs/chrootenv_aarch64.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
essential:
2+
- dpkg
3+
- apt
4+
- debianutils
5+
- init-system-helpers
6+
- dash
7+
- mount
8+
- sysvinit-utils
9+
- gzip
10+
- bash
11+
- util-linux
12+
- tar
13+
- base-files
14+
- base-passwd
15+
- sed
16+
- bsdutils
17+
- coreutils
18+
- findutils
19+
- grep
20+
- login
21+
- perl-base
22+
- diffutils
23+
- libc-bin
24+
- hostname
25+
- ncurses-bin
26+
- ncurses-base
27+
28+
packages:
29+
- mmdebstrap
30+
- grub-efi-arm64-bin

‎config/osv/debian/debian13/chrootenvconfigs/chrootenv_x86_64.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
essential:
2+
- dpkg
3+
- apt
4+
- debianutils
5+
- init-system-helpers
6+
- dash
7+
- mount
8+
- sysvinit-utils
9+
- gzip
10+
- bash
11+
- util-linux
12+
- tar
13+
- base-files
14+
- base-passwd
15+
- sed
16+
- bsdutils
17+
- coreutils
18+
- findutils
19+
- grep
20+
- login
21+
- perl-base
22+
- diffutils
23+
- libc-bin
24+
- hostname
25+
- ncurses-bin
26+
- ncurses-base
27+
28+
packages:
29+
- mmdebstrap
30+
- grub-pc-bin
31+
- grub-efi-amd64-bin

‎config/osv/debian/debian13/chrootenvconfigs/local.list‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
deb [trusted=yes] file:///cdrom/cache-repo stable main

‎config/osv/debian/debian13/config.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Debian 13 (Trixie) OS Configuration
2+
# This file defines architecture-specific build configurations for Debian 13 (Trixie)
3+
4+
x86_64:
5+
dist: debian13 # Distribution identifier
6+
arch: x86_64 # Target architecture
7+
pkgType: deb # Package management system
8+
chrootenvConfigFile: chrootenvconfigs/chrootenv_x86_64.yml # Path to chrootenv config
9+
releaseVersion: "13.0" # Distribution release version
10+
aarch64:
11+
dist: debian13 # Distribution identifier
12+
arch: aarch64 # Target architecture
13+
pkgType: deb # Package management system
14+
chrootenvConfigFile: chrootenvconfigs/chrootenv_aarch64.yml # Path to chrootenv config
15+
releaseVersion: "13.0" # Distribution release version

‎config/osv/debian/debian13/imageconfigs/additionalfiles/debian-trixie.list‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
deb http://deb.debian.org/debian trixie main contrib non-free non-free-firmware
2+
deb http://deb.debian.org/debian trixie-updates main contrib non-free non-free-firmware
3+
deb http://deb.debian.org/debian-security trixie-security main contrib non-free non-free-firmware

‎config/osv/debian/debian13/imageconfigs/additionalfiles/dhcp.network‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[Match]
2+
Name=en*
3+
4+
[Network]
5+
DHCP=yes

‎config/osv/debian/debian13/imageconfigs/additionalfiles/getty@.service‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[Service]
2+
ExecStart=
3+
ExecStart=-/sbin/agetty --noclear --autologin root --keep-baud %I $TERM
4+
5+
# Default to tty1 but allow other choices

‎config/osv/debian/debian13/imageconfigs/additionalfiles/ptl/.placeholder‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# PTL (Platform Telemetry Layer) configuration files
2+
# This directory contains optional PTL-related YAML files
3+
# Add custom PTL configurations here as needed

0 commit comments

Comments
 (0)