Import MNT build from josch

zeha · zeha · commit f0b0da7ddcc0 · 2025-06-28T14:16:59.000+02:00
diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
@@ -44,21 +44,11 @@ jobs:
       fail-fast: false
       matrix:
         host_release:
-          - bookworm
           - trixie
         extra_classes:
-          - ""
-          - "GRML_GHACI_CLOUD"
+          - "REFORM"
         arch:
-          - amd64
           - arm64
-        exclude:
-          - host_release: bookworm
-            extra_classes: "GRML_GHACI_CLOUD"
-          - arch: arm64
-            host_release: bookworm
-          - arch: arm64
-            extra_classes: "GRML_GHACI_CLOUD"
 
     runs-on: ${{ matrix.arch == 'arm64' && 'ubuntu-24.04-arm' || 'ubuntu-latest' }}
     steps:
@@ -81,19 +71,19 @@ jobs:
           path: |
             results-initial/*
 
-      - run: ./test/gha-build-iso.sh build-only-twice
-        name: "Repack ISO twice on ${{matrix.host_release}} ${{matrix.arch}}${{matrix.extra_classes && format(' with {0}', matrix.extra_classes) || ''}}"
-        env:
-          HOST_RELEASE: ${{matrix.host_release}}
-          EXTRA_CLASSES: ${{matrix.extra_classes}}
-          ARCH: ${{matrix.arch}}
+      # - run: ./test/gha-build-iso.sh build-only-twice
+      #   name: "Repack ISO twice on ${{matrix.host_release}} ${{matrix.arch}}${{matrix.extra_classes && format(' with {0}', matrix.extra_classes) || ''}}"
+      #   env:
+      #     HOST_RELEASE: ${{matrix.host_release}}
+      #     EXTRA_CLASSES: ${{matrix.extra_classes}}
+      #     ARCH: ${{matrix.arch}}
 
-      - name: Archive repacked ISO
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: grml-live-build-result-repack-${{matrix.host_release}}-${{matrix.arch}}${{matrix.extra_classes && format('-{0}', matrix.extra_classes) || ''}}
-          if-no-files-found: error
-          retention-days: 15
-          path: |
-            results-build-only-second/*
+      # - name: Archive repacked ISO
+      #   if: always()
+      #   uses: actions/upload-artifact@v4
+      #   with:
+      #     name: grml-live-build-result-repack-${{matrix.host_release}}-${{matrix.arch}}${{matrix.extra_classes && format('-{0}', matrix.extra_classes) || ''}}
+      #     if-no-files-found: error
+      #     retention-days: 15
+      #     path: |
+      #       results-build-only-second/*
diff --git a/build-driver/build.py b/build-driver/build.py
@@ -303,6 +303,8 @@ def install_debian_dependencies():
             git ,
             curl ,
             dosfstools ,
+            e2fsprogs ,
+            fdisk ,
             jo ,
             mmdebstrap ,
             moreutils ,
diff --git a/config/files/REFORM/etc/X11/xorg.conf.d/etnaviv.conf b/config/files/REFORM/etc/X11/xorg.conf.d/etnaviv.conf
@@ -0,0 +1,7 @@
+Section "Device"
+  Identifier "eDP-1"
+  Driver "modesetting"
+  Option "kmsdev" "/dev/dri/card0"
+  Option "AccelMethod" "glamor"
+  Option "Atomic" "On"
+EndSection
diff --git a/config/files/REFORM/etc/apt/preferences.d/reform.pref b/config/files/REFORM/etc/apt/preferences.d/reform.pref
@@ -0,0 +1,3 @@
+Package: *
+Pin: origin "reform.debian.net"
+Pin-Priority: 999
diff --git a/config/files/REFORM/etc/apt/sources.list.d/.gitkeep b/config/files/REFORM/etc/apt/sources.list.d/.gitkeep
diff --git a/config/package_config/REFORM b/config/package_config/REFORM
@@ -0,0 +1,7 @@
+PACKAGES skip
+linux-image-arm64
+
+PACKAGES install
+reform-tools
+linux-image-mnt-reform-arm64
+linux-headers-mnt-reform-arm64
diff --git a/config/scripts/REFORM/fcopy-etnaviv b/config/scripts/REFORM/fcopy-etnaviv
@@ -0,0 +1,3 @@
+#!/bin/sh
+set -eu
+fcopy -M -v /etc/X11/xorg.conf.d/etnaviv.conf
diff --git a/grml-live b/grml-live
@@ -986,6 +986,8 @@ else
     fi
   fi
 
+  ls -la "$BUILD_OUTPUT/boot/dtbs/"
+
   # we need to set "$BOOTID" before we invoke adjust_boot_files for the
   # first time, being inside grub_setup below
   if [ -n "$NO_BOOTID" ] ; then
@@ -1058,6 +1060,10 @@ else
 
   mkdir -p "${BUILD_OUTPUT}"/boot/addons
 
+  mkdir -p "${BUILD_OUTPUT}"/boot/extlinux
+  cp "${TEMPLATE_DIRECTORY}"/boot/extlinux/extlinux.conf "${BUILD_OUTPUT}"/boot/extlinux/
+  adjust_boot_files "${BUILD_OUTPUT}"/boot/extlinux/extlinux.conf
+
   if [ "$ARCH" != "arm64" ] ; then
     # copy _required_ isolinux files
     mkdir -p "${BUILD_OUTPUT}"/boot/isolinux
@@ -1476,7 +1482,7 @@ generate_build_info() {
 
 # ISO_OUTPUT - mkisofs {{{
 [ -n "$ISO_OUTPUT" ] || ISO_OUTPUT="$OUTPUT/grml_isos"
-[ -n "$ISO_NAME" ] || ISO_NAME="${GRML_NAME}_${VERSION}.iso"
+[ -n "$ISO_NAME" ] || ISO_NAME="${GRML_NAME}_${VERSION}.img"
 
 BOOT_ARGS="-no-emul-boot -boot-load-size 4 -boot-info-table -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat -isohybrid-mbr ${CHROOT_OUTPUT}/usr/lib/ISOLINUX/isohdpfx.bin"
 EFI_ARGS="-eltorito-alt-boot -e boot/efi.img -no-emul-boot -isohybrid-gpt-basdat"
@@ -1515,14 +1521,20 @@ else
 
    cap_timestamps "$BUILD_OUTPUT"
 
-   log "$MKISOFS -V '${GRML_NAME} ${VERSION}' -publisher 'grml-live | grml.org' -l -r -J $BOOT_ARGS $EFI_ARGS -o ${ISO_OUTPUT}/${ISO_NAME} ."
-   einfo "Generating ISO file..."
-   touch -d @"$SOURCE_DATE_EPOCH" "$BUILD_OUTPUT"/
-   # shellcheck disable=SC2086 # BOOT_ARGS and EFI_ARGS need splitting
-   $MKISOFS -V "${GRML_NAME} ${VERSION}" -publisher 'grml-live | grml.org' \
-           -l -r -J $BOOT_ARGS $EFI_ARGS \
-           -o "${ISO_OUTPUT}/${ISO_NAME}" "$BUILD_OUTPUT"/ ; RC=$?
-   eend $RC
+   einfo "Generating ext4 disk image..."
+   /sbin/mke2fs -q -F -o Linux -E offset=16777216 -T ext4 -b 4096 -d "$BUILD_OUTPUT"/ "${ISO_OUTPUT}/${ISO_NAME}" 260000
+   eend $?
+   einfo "Resizing disk image to make space for MBR..."
+   truncate --size=+512 "${ISO_OUTPUT}/${ISO_NAME}"
+   eend $?
+   einfo "Making MBR ..."
+   MBRTMP=$(mktemp)
+   echo 'label: dos
+   start=32768, size=2080000, type=83' > "$MBRTMP"
+   cat "$MBRTMP"
+   /sbin/sfdisk "${ISO_OUTPUT}/${ISO_NAME}" < "$MBRTMP"
+   eend $?
+   rm -f "$MBRTMP"
 
    # do not continue on errors, otherwise we might generate/overwrite the ISO with dd if=... stuff
    if [ "$RC" != 0 ] ; then
diff --git a/templates/boot/extlinux/extlinux.conf b/templates/boot/extlinux/extlinux.conf
@@ -0,0 +1,12 @@
+default l0
+menu title Grml Live Linux
+prompt 0
+timeout 50
+
+label l0
+menu label Grml Live Linux
+linux /boot/%SHORT_NAME%/vmlinuz
+initrd /boot/%SHORT_NAME%/initrd.img
+fdtdir /boot/%SHORT_NAME%/dtbs/
+append ro no_console_suspend cryptomgr.notests \${bootargs} fbcon=font:TER16x32 console=tty1 boot=live live-media-path=/live/%GRML_NAME%/ bootid=%BOOTID%
+
diff --git a/test/gha-build-iso.sh b/test/gha-build-iso.sh
@@ -18,6 +18,13 @@ cat >build-gha-ci-test-config-initial <<EOT
 last_release: "2024.12"
 EOT
 
+mkdir -p config/files/REFORM/etc/apt/sources.list.d/
+/usr/lib/apt/apt-helper \
+	download-file \
+	https://reform.debian.net/reform_trixie.sources \
+	config/files/REFORM/etc/apt/sources.list.d/reform_trixie.sources \
+	"SHA1:3d453dbf355beebf494ce6f61d2110b98e92fcf5"
+
 run_build() {
     local config_filename
     config_filename=$1
@@ -32,7 +39,22 @@ run_build() {
         && git config --global --add safe.directory /source \
         && /source/build-driver/build /source ${build_mode} /source/${config_filename} ghaci $ARCH testing"
 
+    /usr/lib/apt/apt-helper \
+        download-file \
+        https://source.mnt.re/reform/reform-boundary-uboot/-/jobs/artifacts/2024-07-19/raw/imx8mq-mnt-reform2-flash.bin?job=build \
+        flash.bin \
+        "SHA1:60ecf649038ebd92bfb6676bdf746daa30825dbf"
+
     sudo chmod -R a+rX results
+    sudo chmod -R a+rwX results/grml_isos
+
+	( set -e ; cd results &&
+	name=$(echo ./grml_isos/*.iso)
+	imgname=${name//.iso/.img}
+    dd if=../flash.bin of="${name}" oseek=66 bs=512 conv=notrunc
+    mv "${name}" "${imgname}"
+    )
+    rm flash.bin
     sudo mv results "${results_directory}"
 }
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+Package: *`
	`2`	`+Pin: origin "reform.debian.net"`
	`3`	`+Pin-Priority: 999`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#!/bin/sh`
	`2`	`+set -eu`
	`3`	`+fcopy -M -v /etc/X11/xorg.conf.d/etnaviv.conf`