From 4179f0539128d5b60c9a681de804182f2c773090 Mon Sep 17 00:00:00 2001
From: Casey Link <unnamedrambler@gmail.com>
Date: Wed, 23 Aug 2023 18:09:02 +0200
Subject: [PATCH] Workaround: modprobe: FATAL: Module sun4i-drm not found in
 directory

see: https://github.com/NixOS/nixpkgs/issues/154163
---
 .github/workflows/ImageBuild.yaml  | 27 +++++++++++++++++----------
 config/generic-aarch64/default.nix |  8 ++++++++
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ImageBuild.yaml b/.github/workflows/ImageBuild.yaml
index f00ca6c..2b982e1 100644
--- a/.github/workflows/ImageBuild.yaml
+++ b/.github/workflows/ImageBuild.yaml
@@ -23,6 +23,13 @@ jobs:
         uses: docker/setup-buildx-action@v2
         timeout-minutes: 12
 
+      - name: Cache Image
+        id: cache-image
+        uses: actions/cache@v3
+        with:
+          path: output
+          key: output
+
       - name: Setup variables
         id: vars
         run: |
@@ -42,27 +49,24 @@ jobs:
 
       - name: Rename iso
         run: |
-          mkdir output
+          ls
+          mkdir -p output
+          ls output
           mv ./${{ steps.vars.outputs.build-output }} output/${{ steps.vars.outputs.iso-name }}
 
-      - name: Cache Image
-        id: cache-image
-        uses: actions/cache@v3
-        with:
-          path: output
-          key: output
   boot-test:
+    name: Test Image
     runs-on: ubuntu-latest
     needs: build-image
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install QEMU and other dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y qemu-system-aarch64 wget unzip
+          sudo apt-get install -y qemu-system-aarch64
 
       - name: Load Image Cache
         id: cache-image
@@ -76,7 +80,9 @@ jobs:
           TAG_NAME: ${{needs.build-image.outputs.tag-name}}
           ISO_NAME: ${{needs.build-image.outputs.iso-name}}
         run: |
-          qemu-system-aarch64 \
+          ls
+          ls output
+          timeout 300 qemu-system-aarch64 \
             -machine type=raspi4
             -m 2G \
             -kernel kernel8.img \
@@ -101,6 +107,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+
       - name: Load Image Cache
         id: cache-image
         uses: actions/cache@v3
diff --git a/config/generic-aarch64/default.nix b/config/generic-aarch64/default.nix
index f8b9434..38ca599 100644
--- a/config/generic-aarch64/default.nix
+++ b/config/generic-aarch64/default.nix
@@ -4,4 +4,12 @@
     <nixpkgs/nixos/modules/installer/sd-card/sd-image-aarch64-new-kernel.nix>
     <nixpkgs/nixos/modules/installer/cd-dvd/channel.nix>
   ];
+  # Workaround: https://github.com/NixOS/nixpkgs/issues/154163
+  # modprobe: FATAL: Module sun4i-drm not found in directory
+  nixpkgs.overlays = [
+    (final: super: {
+      makeModulesClosure = x:
+        super.makeModulesClosure (x // {allowMissing = true;});
+    })
+  ];
 }