Skip to content

Commit 9048af9

Browse files
committed
Import @josch MNT build
1 parent 583662e commit 9048af9

File tree

9 files changed

+73
-7
lines changed

9 files changed

+73
-7
lines changed

.github/workflows/test-build.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,11 @@ jobs:
4444
fail-fast: false
4545
matrix:
4646
host_release:
47-
- bookworm
4847
- trixie
4948
extra_classes:
50-
- ""
51-
- "GRML_GHACI_CLOUD"
52-
exclude:
53-
- host_release: bookworm
54-
extra_classes: "GRML_GHACI_CLOUD"
49+
- "REFORM"
5550

56-
runs-on: ubuntu-latest
51+
runs-on: ubuntu-24.04-arm
5752
steps:
5853
- uses: actions/checkout@v4
5954

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
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/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
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

grml-live

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -939,6 +939,11 @@ else
939939
bailout 11
940940
fi
941941

942+
DTBS=$(ls -d "$CHROOT_OUTPUT"/boot/dtbs/* 2>/dev/null| sort -r | head -1)
943+
if [ -n "$DTBS" ]; then
944+
cp -r "$DTBS" "$BUILD_OUTPUT"/boot/"${SHORT_NAME}"/dtbs || exit 1
945+
fi
946+
942947
# we need to set "$BOOTID" before we invoke adjust_boot_files for the
943948
# first time, being inside grub_setup below
944949
if [ -n "$NO_BOOTID" ] ; then
@@ -1011,6 +1016,10 @@ else
10111016

10121017
mkdir -p "${BUILD_OUTPUT}"/boot/addons
10131018

1019+
mkdir -p "${BUILD_OUTPUT}"/boot/extlinux
1020+
cp "${TEMPLATE_DIRECTORY}"/boot/extlinux/extlinux.conf "${BUILD_OUTPUT}"/boot/extlinux/
1021+
adjust_boot_files "${BUILD_OUTPUT}"/boot/extlinux/extlinux.conf
1022+
10141023
if [ "$ARCH" != "arm64" ] ; then
10151024
# copy _required_ isolinux files
10161025
mkdir -p "${BUILD_OUTPUT}"/boot/isolinux
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
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 ro no_console_suspend cryptomgr.notests \${bootargs} fbcon=font:TER16x32 console=tty1 boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID%
12+

test/gha-build-iso.sh

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@ cat >build-gha-ci-test-config-initial <<EOT
1313
last_release: "2024.12"
1414
EOT
1515

16+
mkdir -p config/files/REFORM/etc/apt/sources.list.d/
17+
/usr/lib/apt/apt-helper \
18+
download-file \
19+
https://reform.debian.net/reform_trixie.sources \
20+
config/files/REFORM/etc/apt/sources.list.d/reform_trixie.sources \
21+
"SHA1:3d453dbf355beebf494ce6f61d2110b98e92fcf5"
22+
1623
run_build() {
1724
local config_filename
1825
config_filename=$1
@@ -28,6 +35,29 @@ run_build() {
2835
&& /source/build-driver/build /source ${build_mode} /source/${config_filename} ghaci amd64 testing"
2936

3037
sudo chmod -R a+rX results
38+
39+
( cd results &&
40+
{
41+
tar --numeric-owner --owner=0 --group=0 --format=pax -c boot/ | head -c 5120
42+
cat ./grml/grml_isos/*.iso | bsdtar -cf - --format pax @-
43+
} | /sbin/mke2fs -q -F -o Linux -E offset=16777216 -T ext4 -b 4096 -d - disk.img 260000 ;
44+
truncate --size=+512 disk.img &&
45+
/sbin/parted -s disk.img mklabel msdos &&
46+
/sbin/parted -s disk.img mkpart primary ext4 16777216B 1081737216B &&
47+
/usr/lib/apt/apt-helper \
48+
download-file \
49+
https://source.mnt.re/reform/reform-boundary-uboot/-/jobs/artifacts/2024-07-19/raw/imx8mq-mnt-reform2-flash.bin?job=build \
50+
flash.bin \
51+
"SHA1:60ecf649038ebd92bfb6676bdf746daa30825dbf" &&
52+
dd if=flash.bin of=disk.img oseek=66 bs=512 conv=notrunc
53+
rm flash.bin
54+
name=$(echo ./grml/grml_isos/*.iso)
55+
name=${name//.iso/.img}
56+
rm ./grml/grml_isos/*.iso
57+
mv disk.img grml/grml_isos/${name}
58+
59+
)
60+
3161
sudo mv results "${results_directory}"
3262
}
3363

0 commit comments

Comments
 (0)