Skip to content

Commit 3710dc4

Browse files
zehazeha
committed
Import MNT build from josch
1 parent fb50836 commit 3710dc4

File tree

13 files changed

+147
-35
lines changed

13 files changed

+147
-35
lines changed

‎.github/workflows/test-build.yml‎

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -44,21 +44,11 @@ jobs:
4444
fail-fast: false
4545
matrix:
4646
host_release:
47-
- bookworm
4847
- trixie
4948
extra_classes:
50-
- ""
51-
- "GRML_GHACI_CLOUD"
49+
- "REFORM"
5250
arch:
53-
- amd64
5451
- arm64
55-
exclude:
56-
- host_release: bookworm
57-
extra_classes: "GRML_GHACI_CLOUD"
58-
- arch: arm64
59-
host_release: bookworm
60-
- arch: arm64
61-
extra_classes: "GRML_GHACI_CLOUD"
6252

6353
runs-on: ${{ matrix.arch == 'arm64' && 'ubuntu-24.04-arm' || 'ubuntu-latest' }}
6454
steps:
@@ -81,19 +71,19 @@ jobs:
8171
path: |
8272
results-initial/*
8373
84-
- run: ./test/gha-build-iso.sh build-only-twice
85-
name: "Repack ISO twice on ${{matrix.host_release}} ${{matrix.arch}}${{matrix.extra_classes && format(' with {0}', matrix.extra_classes) || ''}}"
86-
env:
87-
HOST_RELEASE: ${{matrix.host_release}}
88-
EXTRA_CLASSES: ${{matrix.extra_classes}}
89-
ARCH: ${{matrix.arch}}
74+
# - run: ./test/gha-build-iso.sh build-only-twice
75+
# name: "Repack ISO twice on ${{matrix.host_release}} ${{matrix.arch}}${{matrix.extra_classes && format(' with {0}', matrix.extra_classes) || ''}}"
76+
# env:
77+
# HOST_RELEASE: ${{matrix.host_release}}
78+
# EXTRA_CLASSES: ${{matrix.extra_classes}}
79+
# ARCH: ${{matrix.arch}}
9080

91-
- name: Archive repacked ISO
92-
if: always()
93-
uses: actions/upload-artifact@v4
94-
with:
95-
name: grml-live-build-result-repack-${{matrix.host_release}}-${{matrix.arch}}${{matrix.extra_classes && format('-{0}', matrix.extra_classes) || ''}}
96-
if-no-files-found: error
97-
retention-days: 15
98-
path: |
99-
results-build-only-second/*
81+
# - name: Archive repacked ISO
82+
# if: always()
83+
# uses: actions/upload-artifact@v4
84+
# with:
85+
# name: grml-live-build-result-repack-${{matrix.host_release}}-${{matrix.arch}}${{matrix.extra_classes && format('-{0}', matrix.extra_classes) || ''}}
86+
# if-no-files-found: error
87+
# retention-days: 15
88+
# path: |
89+
# results-build-only-second/*

‎build-driver/build.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,8 @@ def install_debian_dependencies():
292292
git ,
293293
curl ,
294294
dosfstools ,
295+
e2fsprogs ,
296+
fdisk ,
295297
jo ,
296298
mmdebstrap ,
297299
moreutils ,

‎config/files/REFORM/etc/X11/xorg.conf.d/etnaviv.conf‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Section "Device"
2+
Identifier "eDP-1"
3+
Driver "modesetting"
4+
Option "kmsdev" "/dev/dri/card0"
5+
Option "AccelMethod" "glamor"
6+
Option "Atomic" "On"
7+
EndSection

‎config/files/REFORM/etc/apt/preferences.d/reform.pref‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Package: *
2+
Pin: origin "reform.debian.net"
3+
Pin-Priority: 999

‎config/files/REFORM/etc/apt/sources.list.d/.gitkeep‎

Whitespace-only changes.

‎config/hooks/REFORM/updatebase‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#!/bin/bash
2+
3+
set -u
4+
set -e
5+
6+
# shellcheck source=/dev/null
7+
. "$GRML_LIVE_CONFIG"
8+
9+
# FAI sets $target, but shellcheck does not know that.
10+
target=${target:?}
11+
12+
mkdir -p "$GRML_FAI_CONFIG"/files/REFORM/etc/apt/sources.list.d/
13+
/usr/lib/apt/apt-helper \
14+
download-file \
15+
https://reform.debian.net/reform_trixie.sources \
16+
"$GRML_FAI_CONFIG"/files/REFORM/etc/apt/sources.list.d/reform_trixie.sources \
17+
"SHA1:3d453dbf355beebf494ce6f61d2110b98e92fcf5"
18+
19+
# install all apt related files
20+
fcopy -M -i -B -v -r /etc/apt
21+
fcopy -M -i -B -v -r /usr/share/keyrings

‎config/media-files/GRMLBASE/boot/extlinux/extlinux.conf‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
default l0
2+
menu title Grml Live Linux
3+
prompt 0
4+
timeout 50
5+
6+
label l0
7+
menu label Grml Live Linux
8+
linux /boot/%SHORT_NAME%/vmlinuz
9+
initrd /boot/%SHORT_NAME%/initrd.img
10+
fdtdir /boot/%SHORT_NAME%/dtbs/
11+
append boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% \${bootargs}
12+
13+
label l1
14+
menu label Grml Live Linux: Enable SSH (with random password)
15+
linux /boot/%SHORT_NAME%/vmlinuz
16+
initrd /boot/%SHORT_NAME%/initrd.img
17+
fdtdir /boot/%SHORT_NAME%/dtbs/
18+
append boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% \${bootargs} ssh
19+
20+
label l2
21+
menu label Grml Live Linux: Load German Keyboard Layout
22+
linux /boot/%SHORT_NAME%/vmlinuz
23+
initrd /boot/%SHORT_NAME%/initrd.img
24+
fdtdir /boot/%SHORT_NAME%/dtbs/
25+
append boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% \${bootargs} lang=de
26+
27+
label l3
28+
menu label Grml Live Linux: Debug Mode
29+
linux /boot/%SHORT_NAME%/vmlinuz
30+
initrd /boot/%SHORT_NAME%/initrd.img
31+
fdtdir /boot/%SHORT_NAME%/dtbs/
32+
append boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID% \${bootargs} initcall verbose debug=vc systemd.log_level=debug systemd.log_target=kmsg log_buf_len=1M

‎config/media-scripts/GRMLBASE/32-uboot‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#!/bin/bash
2+
# Filename: ${GRML_FAI_CONFIG}/media-scripts/GRMLBASE/32-uboot
3+
# Purpose: Install u-boot configuration
4+
# Authors: grml-team (grml.org)
5+
# Bug-Reports: see http://grml.org/bugs/
6+
# License: This file is licensed under the GPL v2 or any later version.
7+
################################################################################
8+
9+
set -u
10+
set -e
11+
12+
if ! ifclass ARM64 ; then
13+
exit 0
14+
fi
15+
16+
# FAI sets $target, but shellcheck does not know that.
17+
target=${target:?}
18+
# shellcheck source=/dev/null
19+
. "$GRML_LIVE_CONFIG"
20+
21+
media_dir="${target}/${GRML_LIVE_MEDIADIR}"
22+
23+
grml-live-command copy-media-files media -r /boot/extlinux
24+
25+
adjust_boot_files "${media_dir}"/boot/extlinux/extlinux.conf

‎config/package_config/REFORM‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
PACKAGES skip
2+
linux-image-arm64
3+
4+
PACKAGES install
5+
reform-tools
6+
linux-image-mnt-reform-arm64
7+
linux-headers-mnt-reform-arm64

‎config/scripts/REFORM/fcopy-etnaviv‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/sh
2+
set -eu
3+
fcopy -M -v /etc/X11/xorg.conf.d/etnaviv.conf

0 commit comments

Comments
 (0)