From 7020eb4fb3c333d6b95ba1075f8b50de2ba0ed61 Mon Sep 17 00:00:00 2001
From: Marcus Weiner <marcus.weiner@gmail.com>
Date: Sun, 11 Aug 2024 22:21:17 +0200
Subject: [PATCH 01/26] Scaffold image build workflow

---
 .github/workflows/build.yaml | 40 ++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 .github/workflows/build.yaml

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
new file mode 100644
index 0000000..05e3950
--- /dev/null
+++ b/.github/workflows/build.yaml
@@ -0,0 +1,40 @@
+name: Gluon
+
+on:
+  push:
+
+env:
+  GLUON_RELEASE: v2021.1.2
+
+jobs:
+  gather_targets:
+    name: Gather targets
+    runs-on: ubuntu-24.04
+    outputs:
+      targets: ${{ steps.list.outputs.targets }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          repository: freifunk-gluon/gluon
+          ref: ${{ env.GLUON_RELEASE }}
+      - run: |
+          "targets=$(make list-targets)" >> $GITHUB_OUTPUT
+        id: list
+
+  build:
+    needs: gather_targets
+    name: Build Images
+    runs-on: ubuntu-24.04
+    strategy:
+      matrix:
+        target: ${{ needs.gather_targets.outputs.targets }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          repository: freifunk-gluon/gluon
+          ref: ${{ env.GLUON_RELEASE }}
+      - uses: actions/checkout@v4
+        with:
+          path: site
+      - run: |
+          echo "Not building target ${{ matrix.target }}"

From c3422808657ef7946683adbc68e04547f89ffd6a Mon Sep 17 00:00:00 2001
From: Marcus Weiner <marcus.weiner@gmail.com>
Date: Sun, 11 Aug 2024 22:22:40 +0200
Subject: [PATCH 02/26] Fix missing checkout

---
 .github/workflows/build.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 05e3950..87b2865 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -17,8 +17,11 @@ jobs:
         with:
           repository: freifunk-gluon/gluon
           ref: ${{ env.GLUON_RELEASE }}
+      - uses: actions/checkout@v4
+        with:
+          path: site
       - run: |
-          "targets=$(make list-targets)" >> $GITHUB_OUTPUT
+          echo "targets=$(make list-targets)" >> $GITHUB_OUTPUT
         id: list
 
   build:

From 139ca40da8a75f646e87b592c29707dae6bb25e5 Mon Sep 17 00:00:00 2001
From: Marcus Weiner <marcus.weiner@gmail.com>
Date: Sun, 11 Aug 2024 22:34:09 +0200
Subject: [PATCH 03/26] Turn target list into json

---
 .github/workflows/build.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 87b2865..f49b67b 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -11,7 +11,7 @@ jobs:
     name: Gather targets
     runs-on: ubuntu-24.04
     outputs:
-      targets: ${{ steps.list.outputs.targets }}
+      targets: ${{ fromJson(steps.list.outputs.targets) }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -21,7 +21,9 @@ jobs:
         with:
           path: site
       - run: |
-          echo "targets=$(make list-targets)" >> $GITHUB_OUTPUT
+          TARGETS=$(make list-targets)
+          # save to output as json
+          echo "targets=[\"${TARGETS//$'\n'/\",\"}\"]" >> $GITHUB_OUTPUT
         id: list
 
   build:

From 02557b84619dfc5d87ce1a888904cf37e64329af Mon Sep 17 00:00:00 2001
From: Marcus Weiner <marcus.weiner@gmail.com>
Date: Sun, 11 Aug 2024 22:35:28 +0200
Subject: [PATCH 04/26] Fix type of output

---
 .github/workflows/build.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index f49b67b..987e4fb 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -11,7 +11,7 @@ jobs:
     name: Gather targets
     runs-on: ubuntu-24.04
     outputs:
-      targets: ${{ fromJson(steps.list.outputs.targets) }}
+      targets: ${{ steps.list.outputs.targets }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -32,7 +32,7 @@ jobs:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        target: ${{ needs.gather_targets.outputs.targets }}
+        target: ${{ fromJson(needs.gather_targets.outputs.targets) }}
     steps:
       - uses: actions/checkout@v4
         with:

From bca85bffd4b35e7b23b5f896032f311bbdd108f5 Mon Sep 17 00:00:00 2001
From: Marcus Weiner <marcus.weiner@gmail.com>
Date: Sun, 11 Aug 2024 22:45:24 +0200
Subject: [PATCH 05/26] Reduce targets for previews

---
 .github/workflows/build.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 987e4fb..1ae8033 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -5,13 +5,14 @@ on:
 
 env:
   GLUON_RELEASE: v2021.1.2
+  PREVIEW_TARGETS: '["x86_64", "ar71xx-generic", "ar71xx-tiny"]'
 
 jobs:
   gather_targets:
     name: Gather targets
     runs-on: ubuntu-24.04
     outputs:
-      targets: ${{ steps.list.outputs.targets }}
+      targets: ${{ github.ref_type == 'tag' && steps.list.outputs.targets || env.PREVIEW_TARGETS }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -20,7 +21,8 @@ jobs:
       - uses: actions/checkout@v4
         with:
           path: site
-      - run: |
+      - if: github.ref_type == 'tag'
+        run: |
           TARGETS=$(make list-targets)
           # save to output as json
           echo "targets=[\"${TARGETS//$'\n'/\",\"}\"]" >> $GITHUB_OUTPUT

From 6d8751c3e087de583e8364745053a15133005940 Mon Sep 17 00:00:00 2001
From: Marcus Weiner <marcus.weiner@gmail.com>
Date: Sun, 11 Aug 2024 22:48:02 +0200
Subject: [PATCH 06/26] Actually build gluon

---
 .github/workflows/build.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 1ae8033..a7cda2b 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -43,5 +43,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           path: site
-      - run: |
-          echo "Not building target ${{ matrix.target }}"
+      - name: Prepare Gluon
+        run: make update
+      - name: Build Gluon Image
+        run: make GLUON_TARGET="${{ matrix.target }}"

From 70f1ee8176aea2cb03168d7a80801248481f771e Mon Sep 17 00:00:00 2001
From: Marcus Weiner <marcus.weiner@gmail.com>
Date: Sun, 11 Aug 2024 22:54:37 +0200
Subject: [PATCH 07/26] Install python2

---
 .github/workflows/build.yaml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index a7cda2b..fd9b44b 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -31,7 +31,7 @@ jobs:
   build:
     needs: gather_targets
     name: Build Images
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         target: ${{ fromJson(needs.gather_targets.outputs.targets) }}
@@ -43,6 +43,11 @@ jobs:
       - uses: actions/checkout@v4
         with:
           path: site
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get -y --no-install-recommends install \
+            python2
       - name: Prepare Gluon
         run: make update
       - name: Build Gluon Image

From 87415e910791cad2822948728b1b0c9887b1cd71 Mon Sep 17 00:00:00 2001
From: Marcus Weiner <marcus.weiner@gmail.com>
Date: Sun, 11 Aug 2024 23:32:32 +0200
Subject: [PATCH 08/26] Fix target name

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index fd9b44b..ff5ae69 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -5,7 +5,7 @@ on:
 
 env:
   GLUON_RELEASE: v2021.1.2
-  PREVIEW_TARGETS: '["x86_64", "ar71xx-generic", "ar71xx-tiny"]'
+  PREVIEW_TARGETS: '["x86-64", "ar71xx-generic", "ar71xx-tiny"]'
 
 jobs:
   gather_targets:

From 51f2a66e9517866fff4b97caefd5f234faf2fb05 Mon Sep 17 00:00:00 2001
From: Marcus Weiner <marcus.weiner@gmail.com>
Date: Sun, 11 Aug 2024 23:32:48 +0200
Subject: [PATCH 09/26] Tune job cancellation

---
 .github/workflows/build.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index ff5ae69..4facbb6 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -7,6 +7,10 @@ env:
   GLUON_RELEASE: v2021.1.2
   PREVIEW_TARGETS: '["x86-64", "ar71xx-generic", "ar71xx-tiny"]'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   gather_targets:
     name: Gather targets
@@ -33,6 +37,7 @@ jobs:
     name: Build Images
     runs-on: ubuntu-22.04
     strategy:
+      fail-fast: false
       matrix:
         target: ${{ fromJson(needs.gather_targets.outputs.targets) }}
     steps:

From 1d854ae755eec3f47365348bc5d3f596c5dedea1 Mon Sep 17 00:00:00 2001
From: Marcus Weiner <marcus.weiner@gmail.com>
Date: Sun, 11 Aug 2024 23:33:08 +0200
Subject: [PATCH 10/26] Cache toolchain

---
 .github/workflows/build.yaml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 4facbb6..09e768c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -48,12 +48,24 @@ jobs:
       - uses: actions/checkout@v4
         with:
           path: site
+
       - name: Install dependencies
         run: |
           sudo apt-get update
           sudo apt-get -y --no-install-recommends install \
             python2
+
       - name: Prepare Gluon
         run: make update
+
+      - name: Cache build artifacts
+        uses: actions/cache@v4
+        with:
+          path: |
+            packages
+            openwrt/build_dir
+            openwrt/staging_dir
+          key: ${{ env.GLUON_RELEASE }}-${{ matrix.target }}-build-deps
+
       - name: Build Gluon Image
         run: make GLUON_TARGET="${{ matrix.target }}"

From 9826fb482aaabb4789b7be6c16db68bf739f7b77 Mon Sep 17 00:00:00 2001
From: Marcus Weiner <marcus.weiner@gmail.com>
Date: Mon, 12 Aug 2024 13:49:46 +0200
Subject: [PATCH 11/26] Always save cache

---
 .github/workflows/build.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 09e768c..1ef8c68 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -66,6 +66,7 @@ jobs:
             openwrt/build_dir
             openwrt/staging_dir
           key: ${{ env.GLUON_RELEASE }}-${{ matrix.target }}-build-deps
+          save-always: true
 
       - name: Build Gluon Image
         run: make GLUON_TARGET="${{ matrix.target }}"

From 15dbf0d5847d79614507fa1e1eb615a0dce1f5fa Mon Sep 17 00:00:00 2001
From: Marcus Weiner <marcus.weiner@gmail.com>
Date: Mon, 12 Aug 2024 13:58:58 +0200
Subject: [PATCH 12/26] Allow debugging build failures

---
 .github/workflows/build.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 1ef8c68..b2a2362 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -69,4 +69,9 @@ jobs:
           save-always: true
 
       - name: Build Gluon Image
+        id: build
         run: make GLUON_TARGET="${{ matrix.target }}"
+
+      - name: Debug build failure
+        if: failure() && steps.build.conclusion == 'failure'
+        run: make -j1 V=sc GLUON_TARGET="${{ matrix.target }}"

From 416e49a3a305ea8aa40fd40ad836c8ec67a06b93 Mon Sep 17 00:00:00 2001
From: Marcus Weiner <marcus.weiner@gmail.com>
Date: Mon, 12 Aug 2024 13:59:56 +0200
Subject: [PATCH 13/26] Help with debugging cache

---
 .github/workflows/build.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index b2a2362..8bcc735 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -68,6 +68,12 @@ jobs:
           key: ${{ env.GLUON_RELEASE }}-${{ matrix.target }}-build-deps
           save-always: true
 
+      - name: Debug cache restore
+        run: |
+          ls -la packages/
+          ls -la openwrt/build_dir/
+          ls -la openwrt/staging_dir/
+
       - name: Build Gluon Image
         id: build
         run: make GLUON_TARGET="${{ matrix.target }}"

From 2d51de026e3c48e8b99a9f203c46ce8edadde8dd Mon Sep 17 00:00:00 2001
From: Marcus Weiner <marcus.weiner@gmail.com>
Date: Mon, 12 Aug 2024 16:09:45 +0200
Subject: [PATCH 14/26] Fix cache logging

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8bcc735..fbcfe1b 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -70,9 +70,9 @@ jobs:
 
       - name: Debug cache restore
         run: |
-          ls -la packages/
-          ls -la openwrt/build_dir/
-          ls -la openwrt/staging_dir/
+          ls -la packages/ || true
+          ls -la openwrt/build_dir/ || true
+          ls -la openwrt/staging_dir/ || true
 
       - name: Build Gluon Image
         id: build

From e5bbe2f1ce612ce3fa8c3cd0d9749bab426b6229 Mon Sep 17 00:00:00 2001
From: Marcus Weiner <marcus.weiner@gmail.com>
Date: Mon, 12 Aug 2024 18:10:10 +0200
Subject: [PATCH 15/26] Restore cache before gluon init

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index fbcfe1b..496b2a2 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -55,9 +55,6 @@ jobs:
           sudo apt-get -y --no-install-recommends install \
             python2
 
-      - name: Prepare Gluon
-        run: make update
-
       - name: Cache build artifacts
         uses: actions/cache@v4
         with:
@@ -74,6 +71,9 @@ jobs:
           ls -la openwrt/build_dir/ || true
           ls -la openwrt/staging_dir/ || true
 
+      - name: Prepare Gluon
+        run: make update
+
       - name: Build Gluon Image
         id: build
         run: make GLUON_TARGET="${{ matrix.target }}"

From ef2dbcaee6e1e1b89980415742971f13354daba6 Mon Sep 17 00:00:00 2001
From: Marcus Weiner <marcus.weiner@gmail.com>
Date: Mon, 12 Aug 2024 18:10:13 +0200
Subject: [PATCH 16/26] Revert "Update config to new gluon version"

This reverts commit 72d1ebef4ceaf1504919d122d17e094af4e24293.
---
 domains/ffddorf_dom0.conf  | 1 -
 domains/ffddorf_dom1.conf  | 1 -
 domains/ffddorf_dom10.conf | 1 -
 domains/ffddorf_dom2.conf  | 1 -
 domains/ffddorf_dom3.conf  | 1 -
 domains/ffddorf_dom4.conf  | 1 -
 domains/ffddorf_dom5.conf  | 1 -
 domains/ffddorf_dom6.conf  | 1 -
 domains/ffddorf_dom7.conf  | 1 -
 domains/ffddorf_dom8.conf  | 1 -
 domains/ffddorf_dom9.conf  | 1 -
 domains/ffneuss_dom0.conf  | 1 -
 domains/ffneuss_dom1.conf  | 1 -
 domains/ffneuss_dom2.conf  | 1 -
 domains/ffneuss_dom3.conf  | 1 -
 domains/ffneuss_dom4.conf  | 1 -
 domains/ffneuss_dom5.conf  | 1 -
 domains/legacy.conf        | 1 -
 domains/legacy_neuss.conf  | 1 -
 site.conf                  | 3 ++-
 20 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/domains/ffddorf_dom0.conf b/domains/ffddorf_dom0.conf
index 3dbb712..ee3ede5 100644
--- a/domains/ffddorf_dom0.conf
+++ b/domains/ffddorf_dom0.conf
@@ -41,7 +41,6 @@
     },
     mesh_vpn = {
         tunneldigger = {
-            mtu = 1364,
             brokers = {
                 'vpn01-dom0.freifunk-duesseldorf.de:11000',
                 'vpn02-dom0.freifunk-duesseldorf.de:11000',
diff --git a/domains/ffddorf_dom1.conf b/domains/ffddorf_dom1.conf
index 25ab0e5..e09a02b 100644
--- a/domains/ffddorf_dom1.conf
+++ b/domains/ffddorf_dom1.conf
@@ -39,7 +39,6 @@
     },
     mesh_vpn = {
         tunneldigger = {
-            mtu = 1364,
             brokers = {
                 'vpn01-dom1.freifunk-duesseldorf.de:11001',
                 'vpn02-dom1.freifunk-duesseldorf.de:11001',
diff --git a/domains/ffddorf_dom10.conf b/domains/ffddorf_dom10.conf
index dbc63e7..0920927 100644
--- a/domains/ffddorf_dom10.conf
+++ b/domains/ffddorf_dom10.conf
@@ -35,7 +35,6 @@
     },
     mesh_vpn = {
         tunneldigger = {
-            mtu = 1364,
             brokers = {
                 'vpn01-dom10.freifunk-duesseldorf.de:11010',
                 'vpn02-dom10.freifunk-duesseldorf.de:11010',
diff --git a/domains/ffddorf_dom2.conf b/domains/ffddorf_dom2.conf
index a7fb0d7..1ff45a8 100644
--- a/domains/ffddorf_dom2.conf
+++ b/domains/ffddorf_dom2.conf
@@ -39,7 +39,6 @@
     },
     mesh_vpn = {
         tunneldigger = {
-            mtu = 1364,
             brokers = {
                 'vpn01-dom2.freifunk-duesseldorf.de:11002',
                 'vpn02-dom2.freifunk-duesseldorf.de:11002',
diff --git a/domains/ffddorf_dom3.conf b/domains/ffddorf_dom3.conf
index 3b5d158..87169ce 100644
--- a/domains/ffddorf_dom3.conf
+++ b/domains/ffddorf_dom3.conf
@@ -35,7 +35,6 @@
     },
     mesh_vpn = {
         tunneldigger = {
-            mtu = 1364,
             brokers = {
                 'vpn01-dom3.freifunk-duesseldorf.de:11003',
                 'vpn02-dom3.freifunk-duesseldorf.de:11003',
diff --git a/domains/ffddorf_dom4.conf b/domains/ffddorf_dom4.conf
index 9c71552..039ce6a 100644
--- a/domains/ffddorf_dom4.conf
+++ b/domains/ffddorf_dom4.conf
@@ -40,7 +40,6 @@
     },
     mesh_vpn = {
         tunneldigger = {
-            mtu = 1364,
             brokers = {
                 'vpn01-dom4.freifunk-duesseldorf.de:11004',
                 'vpn02-dom4.freifunk-duesseldorf.de:11004',
diff --git a/domains/ffddorf_dom5.conf b/domains/ffddorf_dom5.conf
index 6a2ea64..bd70ae6 100644
--- a/domains/ffddorf_dom5.conf
+++ b/domains/ffddorf_dom5.conf
@@ -35,7 +35,6 @@
     },
     mesh_vpn = {
         tunneldigger = {
-            mtu = 1364,
             brokers = {
                 'vpn01-dom5.freifunk-duesseldorf.de:11005',
                 'vpn02-dom5.freifunk-duesseldorf.de:11005',
diff --git a/domains/ffddorf_dom6.conf b/domains/ffddorf_dom6.conf
index 5cabf0c..43bc329 100644
--- a/domains/ffddorf_dom6.conf
+++ b/domains/ffddorf_dom6.conf
@@ -37,7 +37,6 @@
     },
     mesh_vpn = {
         tunneldigger = {
-            mtu = 1364,
             brokers = {
                 'vpn01-dom6.freifunk-duesseldorf.de:11006',
                 'vpn02-dom6.freifunk-duesseldorf.de:11006',
diff --git a/domains/ffddorf_dom7.conf b/domains/ffddorf_dom7.conf
index dc1744f..f238783 100644
--- a/domains/ffddorf_dom7.conf
+++ b/domains/ffddorf_dom7.conf
@@ -35,7 +35,6 @@
     },
     mesh_vpn = {
         tunneldigger = {
-            mtu = 1364,
             brokers = {
                 'vpn01-dom7.freifunk-duesseldorf.de:11007',
                 'vpn02-dom7.freifunk-duesseldorf.de:11007',
diff --git a/domains/ffddorf_dom8.conf b/domains/ffddorf_dom8.conf
index 7bae00b..f534b21 100644
--- a/domains/ffddorf_dom8.conf
+++ b/domains/ffddorf_dom8.conf
@@ -39,7 +39,6 @@
     },
     mesh_vpn = {
         tunneldigger = {
-            mtu = 1364,
             brokers = {
                 'vpn01-dom8.freifunk-duesseldorf.de:11008',
                 'vpn02-dom8.freifunk-duesseldorf.de:11008',
diff --git a/domains/ffddorf_dom9.conf b/domains/ffddorf_dom9.conf
index 4378cfb..12e5b15 100644
--- a/domains/ffddorf_dom9.conf
+++ b/domains/ffddorf_dom9.conf
@@ -37,7 +37,6 @@
     },
     mesh_vpn = {
         tunneldigger = {
-            mtu = 1364,
             brokers = {
                 'vpn01-dom9.freifunk-duesseldorf.de:11009',
                 'vpn02-dom9.freifunk-duesseldorf.de:11009',
diff --git a/domains/ffneuss_dom0.conf b/domains/ffneuss_dom0.conf
index 00b1c0e..861fddb 100644
--- a/domains/ffneuss_dom0.conf
+++ b/domains/ffneuss_dom0.conf
@@ -37,7 +37,6 @@
     },
     mesh_vpn = {
         tunneldigger = {
-            mtu = 1364,
             brokers = {
                 'vpn01-dom0.freifunk-neuss.de:12000',
                 'vpn02-dom0.freifunk-neuss.de:12000',
diff --git a/domains/ffneuss_dom1.conf b/domains/ffneuss_dom1.conf
index 946eb80..bb400f0 100644
--- a/domains/ffneuss_dom1.conf
+++ b/domains/ffneuss_dom1.conf
@@ -37,7 +37,6 @@
     },
     mesh_vpn = {
         tunneldigger = {
-            mtu = 1364,
             brokers = {
                 'vpn01-dom1.freifunk-neuss.de:12001',
                 'vpn02-dom1.freifunk-neuss.de:12001',
diff --git a/domains/ffneuss_dom2.conf b/domains/ffneuss_dom2.conf
index 565a381..3fb1c8b 100644
--- a/domains/ffneuss_dom2.conf
+++ b/domains/ffneuss_dom2.conf
@@ -37,7 +37,6 @@
     },
     mesh_vpn = {
         tunneldigger = {
-            mtu = 1364,
             brokers = {
                 'vpn01-dom2.freifunk-neuss.de:12002',
                 'vpn02-dom2.freifunk-neuss.de:12002',
diff --git a/domains/ffneuss_dom3.conf b/domains/ffneuss_dom3.conf
index bc634ed..0e8a509 100644
--- a/domains/ffneuss_dom3.conf
+++ b/domains/ffneuss_dom3.conf
@@ -38,7 +38,6 @@
     },
     mesh_vpn = {
         tunneldigger = {
-            mtu = 1364,
             brokers = {
                 'vpn01-dom3.freifunk-neuss.de:12003',
                 'vpn02-dom3.freifunk-neuss.de:12003',
diff --git a/domains/ffneuss_dom4.conf b/domains/ffneuss_dom4.conf
index 99d6a41..2295050 100644
--- a/domains/ffneuss_dom4.conf
+++ b/domains/ffneuss_dom4.conf
@@ -38,7 +38,6 @@
     },
     mesh_vpn = {
         tunneldigger = {
-            mtu = 1364,
             brokers = {
                 'vpn01-dom4.freifunk-neuss.de:12004',
                 'vpn02-dom4.freifunk-neuss.de:12004',
diff --git a/domains/ffneuss_dom5.conf b/domains/ffneuss_dom5.conf
index 48ac649..3300ef6 100644
--- a/domains/ffneuss_dom5.conf
+++ b/domains/ffneuss_dom5.conf
@@ -39,7 +39,6 @@
     },
     mesh_vpn = {
         tunneldigger = {
-            mtu = 1364,
             brokers = {
                 'vpn01-dom5.freifunk-neuss.de:12005',
                 'vpn02-dom5.freifunk-neuss.de:12005',
diff --git a/domains/legacy.conf b/domains/legacy.conf
index 4571e89..2707a35 100644
--- a/domains/legacy.conf
+++ b/domains/legacy.conf
@@ -32,7 +32,6 @@
     },
     mesh_vpn = {
         tunneldigger = {
-            mtu = 1364,
             brokers = {
                 'vpn01.freifunk-duesseldorf.de:10050',
                 'vpn02.freifunk-duesseldorf.de:10050',
diff --git a/domains/legacy_neuss.conf b/domains/legacy_neuss.conf
index 39eceb3..7af083b 100644
--- a/domains/legacy_neuss.conf
+++ b/domains/legacy_neuss.conf
@@ -32,7 +32,6 @@
     },
     mesh_vpn = {
         tunneldigger = {
-            mtu = 1364,
             brokers = {
                 'supernode1.freifunk-neuss.de:10030',
                 'supernode2.freifunk-neuss.de:10030',
diff --git a/site.conf b/site.conf
index 7dcd13c..4679270 100644
--- a/site.conf
+++ b/site.conf
@@ -40,6 +40,7 @@
     },
     mesh_vpn = {
         enabled = true,
+        mtu = 1364,
         bandwidth_limit = {
             enabled = false,
             ingress = 3000,
@@ -56,7 +57,7 @@
                     'http://1.updates.freifunk-duesseldorf.de/stable/sysupgrade',
                     'http://2.updates.freifunk-duesseldorf.de/stable/sysupgrade',
                 },
-                good_signatures = 1,
+                good_signatures = 2,
                 pubkeys = {
                     'cb79f3377ad78c0782a38e0fb6fc2a34270ca4c89c9e971b201a89bf8ddcd96f', -- CyrusFox (Freifunk Düsseldorf)
                     'c1eb8c55dd21bc4882a67b2b1f3cb50c572288acc35e52b393212ebf2b40180b', -- nomaster (Freifunk Düsseldorf)

From 4efe30b87c444bd4fff7e1e826fb8b91b02ec5be Mon Sep 17 00:00:00 2001
From: Marcus Weiner <marcus.weiner@gmail.com>
Date: Mon, 12 Aug 2024 18:19:17 +0200
Subject: [PATCH 17/26] Ensure cache is always saved

Context: https://github.com/actions/cache/issues/1315
---
 .github/workflows/build.yaml | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 496b2a2..96a70a1 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -55,15 +55,14 @@ jobs:
           sudo apt-get -y --no-install-recommends install \
             python2
 
-      - name: Cache build artifacts
-        uses: actions/cache@v4
+      - name: Restore toolchain cache
+        uses: actions/cache/restore@v4
         with:
           path: |
             packages
             openwrt/build_dir
             openwrt/staging_dir
-          key: ${{ env.GLUON_RELEASE }}-${{ matrix.target }}-build-deps
-          save-always: true
+          key: &cache-key "${{ env.GLUON_RELEASE }}-${{ matrix.target }}-build-deps"
 
       - name: Debug cache restore
         run: |
@@ -81,3 +80,13 @@ jobs:
       - name: Debug build failure
         if: failure() && steps.build.conclusion == 'failure'
         run: make -j1 V=sc GLUON_TARGET="${{ matrix.target }}"
+
+      - name: Save toolchain cache
+        uses: actions/cache/save@v4
+        if: always()
+        with:
+          path: |
+            packages
+            openwrt/build_dir
+            openwrt/staging_dir
+          key: *cache-key

From 284fa77529fb66370c34b9d48b10e01511abd920 Mon Sep 17 00:00:00 2001
From: Marcus Weiner <marcus.weiner@gmail.com>
Date: Mon, 12 Aug 2024 18:20:16 +0200
Subject: [PATCH 18/26] Fix invalid use of anchors

---
 .github/workflows/build.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 96a70a1..899f757 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -62,7 +62,8 @@ jobs:
             packages
             openwrt/build_dir
             openwrt/staging_dir
-          key: &cache-key "${{ env.GLUON_RELEASE }}-${{ matrix.target }}-build-deps"
+          # keep this in sync with the key on the restore action!
+          key: ${{ env.GLUON_RELEASE }}-${{ matrix.target }}-build-deps
 
       - name: Debug cache restore
         run: |
@@ -89,4 +90,4 @@ jobs:
             packages
             openwrt/build_dir
             openwrt/staging_dir
-          key: *cache-key
+          key: ${{ env.GLUON_RELEASE }}-${{ matrix.target }}-build-deps

From e61c0ca6aa7841fa646f1185e095725ae4bcd75f Mon Sep 17 00:00:00 2001
From: Marcus Weiner <marcus.weiner@gmail.com>
Date: Mon, 12 Aug 2024 20:30:18 +0200
Subject: [PATCH 19/26] Reapply "Update config to new gluon version"

This reverts commit ef2dbcaee6e1e1b89980415742971f13354daba6.
---
 domains/ffddorf_dom0.conf  | 1 +
 domains/ffddorf_dom1.conf  | 1 +
 domains/ffddorf_dom10.conf | 1 +
 domains/ffddorf_dom2.conf  | 1 +
 domains/ffddorf_dom3.conf  | 1 +
 domains/ffddorf_dom4.conf  | 1 +
 domains/ffddorf_dom5.conf  | 1 +
 domains/ffddorf_dom6.conf  | 1 +
 domains/ffddorf_dom7.conf  | 1 +
 domains/ffddorf_dom8.conf  | 1 +
 domains/ffddorf_dom9.conf  | 1 +
 domains/ffneuss_dom0.conf  | 1 +
 domains/ffneuss_dom1.conf  | 1 +
 domains/ffneuss_dom2.conf  | 1 +
 domains/ffneuss_dom3.conf  | 1 +
 domains/ffneuss_dom4.conf  | 1 +
 domains/ffneuss_dom5.conf  | 1 +
 domains/legacy.conf        | 1 +
 domains/legacy_neuss.conf  | 1 +
 site.conf                  | 3 +--
 20 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/domains/ffddorf_dom0.conf b/domains/ffddorf_dom0.conf
index ee3ede5..3dbb712 100644
--- a/domains/ffddorf_dom0.conf
+++ b/domains/ffddorf_dom0.conf
@@ -41,6 +41,7 @@
     },
     mesh_vpn = {
         tunneldigger = {
+            mtu = 1364,
             brokers = {
                 'vpn01-dom0.freifunk-duesseldorf.de:11000',
                 'vpn02-dom0.freifunk-duesseldorf.de:11000',
diff --git a/domains/ffddorf_dom1.conf b/domains/ffddorf_dom1.conf
index e09a02b..25ab0e5 100644
--- a/domains/ffddorf_dom1.conf
+++ b/domains/ffddorf_dom1.conf
@@ -39,6 +39,7 @@
     },
     mesh_vpn = {
         tunneldigger = {
+            mtu = 1364,
             brokers = {
                 'vpn01-dom1.freifunk-duesseldorf.de:11001',
                 'vpn02-dom1.freifunk-duesseldorf.de:11001',
diff --git a/domains/ffddorf_dom10.conf b/domains/ffddorf_dom10.conf
index 0920927..dbc63e7 100644
--- a/domains/ffddorf_dom10.conf
+++ b/domains/ffddorf_dom10.conf
@@ -35,6 +35,7 @@
     },
     mesh_vpn = {
         tunneldigger = {
+            mtu = 1364,
             brokers = {
                 'vpn01-dom10.freifunk-duesseldorf.de:11010',
                 'vpn02-dom10.freifunk-duesseldorf.de:11010',
diff --git a/domains/ffddorf_dom2.conf b/domains/ffddorf_dom2.conf
index 1ff45a8..a7fb0d7 100644
--- a/domains/ffddorf_dom2.conf
+++ b/domains/ffddorf_dom2.conf
@@ -39,6 +39,7 @@
     },
     mesh_vpn = {
         tunneldigger = {
+            mtu = 1364,
             brokers = {
                 'vpn01-dom2.freifunk-duesseldorf.de:11002',
                 'vpn02-dom2.freifunk-duesseldorf.de:11002',
diff --git a/domains/ffddorf_dom3.conf b/domains/ffddorf_dom3.conf
index 87169ce..3b5d158 100644
--- a/domains/ffddorf_dom3.conf
+++ b/domains/ffddorf_dom3.conf
@@ -35,6 +35,7 @@
     },
     mesh_vpn = {
         tunneldigger = {
+            mtu = 1364,
             brokers = {
                 'vpn01-dom3.freifunk-duesseldorf.de:11003',
                 'vpn02-dom3.freifunk-duesseldorf.de:11003',
diff --git a/domains/ffddorf_dom4.conf b/domains/ffddorf_dom4.conf
index 039ce6a..9c71552 100644
--- a/domains/ffddorf_dom4.conf
+++ b/domains/ffddorf_dom4.conf
@@ -40,6 +40,7 @@
     },
     mesh_vpn = {
         tunneldigger = {
+            mtu = 1364,
             brokers = {
                 'vpn01-dom4.freifunk-duesseldorf.de:11004',
                 'vpn02-dom4.freifunk-duesseldorf.de:11004',
diff --git a/domains/ffddorf_dom5.conf b/domains/ffddorf_dom5.conf
index bd70ae6..6a2ea64 100644
--- a/domains/ffddorf_dom5.conf
+++ b/domains/ffddorf_dom5.conf
@@ -35,6 +35,7 @@
     },
     mesh_vpn = {
         tunneldigger = {
+            mtu = 1364,
             brokers = {
                 'vpn01-dom5.freifunk-duesseldorf.de:11005',
                 'vpn02-dom5.freifunk-duesseldorf.de:11005',
diff --git a/domains/ffddorf_dom6.conf b/domains/ffddorf_dom6.conf
index 43bc329..5cabf0c 100644
--- a/domains/ffddorf_dom6.conf
+++ b/domains/ffddorf_dom6.conf
@@ -37,6 +37,7 @@
     },
     mesh_vpn = {
         tunneldigger = {
+            mtu = 1364,
             brokers = {
                 'vpn01-dom6.freifunk-duesseldorf.de:11006',
                 'vpn02-dom6.freifunk-duesseldorf.de:11006',
diff --git a/domains/ffddorf_dom7.conf b/domains/ffddorf_dom7.conf
index f238783..dc1744f 100644
--- a/domains/ffddorf_dom7.conf
+++ b/domains/ffddorf_dom7.conf
@@ -35,6 +35,7 @@
     },
     mesh_vpn = {
         tunneldigger = {
+            mtu = 1364,
             brokers = {
                 'vpn01-dom7.freifunk-duesseldorf.de:11007',
                 'vpn02-dom7.freifunk-duesseldorf.de:11007',
diff --git a/domains/ffddorf_dom8.conf b/domains/ffddorf_dom8.conf
index f534b21..7bae00b 100644
--- a/domains/ffddorf_dom8.conf
+++ b/domains/ffddorf_dom8.conf
@@ -39,6 +39,7 @@
     },
     mesh_vpn = {
         tunneldigger = {
+            mtu = 1364,
             brokers = {
                 'vpn01-dom8.freifunk-duesseldorf.de:11008',
                 'vpn02-dom8.freifunk-duesseldorf.de:11008',
diff --git a/domains/ffddorf_dom9.conf b/domains/ffddorf_dom9.conf
index 12e5b15..4378cfb 100644
--- a/domains/ffddorf_dom9.conf
+++ b/domains/ffddorf_dom9.conf
@@ -37,6 +37,7 @@
     },
     mesh_vpn = {
         tunneldigger = {
+            mtu = 1364,
             brokers = {
                 'vpn01-dom9.freifunk-duesseldorf.de:11009',
                 'vpn02-dom9.freifunk-duesseldorf.de:11009',
diff --git a/domains/ffneuss_dom0.conf b/domains/ffneuss_dom0.conf
index 861fddb..00b1c0e 100644
--- a/domains/ffneuss_dom0.conf
+++ b/domains/ffneuss_dom0.conf
@@ -37,6 +37,7 @@
     },
     mesh_vpn = {
         tunneldigger = {
+            mtu = 1364,
             brokers = {
                 'vpn01-dom0.freifunk-neuss.de:12000',
                 'vpn02-dom0.freifunk-neuss.de:12000',
diff --git a/domains/ffneuss_dom1.conf b/domains/ffneuss_dom1.conf
index bb400f0..946eb80 100644
--- a/domains/ffneuss_dom1.conf
+++ b/domains/ffneuss_dom1.conf
@@ -37,6 +37,7 @@
     },
     mesh_vpn = {
         tunneldigger = {
+            mtu = 1364,
             brokers = {
                 'vpn01-dom1.freifunk-neuss.de:12001',
                 'vpn02-dom1.freifunk-neuss.de:12001',
diff --git a/domains/ffneuss_dom2.conf b/domains/ffneuss_dom2.conf
index 3fb1c8b..565a381 100644
--- a/domains/ffneuss_dom2.conf
+++ b/domains/ffneuss_dom2.conf
@@ -37,6 +37,7 @@
     },
     mesh_vpn = {
         tunneldigger = {
+            mtu = 1364,
             brokers = {
                 'vpn01-dom2.freifunk-neuss.de:12002',
                 'vpn02-dom2.freifunk-neuss.de:12002',
diff --git a/domains/ffneuss_dom3.conf b/domains/ffneuss_dom3.conf
index 0e8a509..bc634ed 100644
--- a/domains/ffneuss_dom3.conf
+++ b/domains/ffneuss_dom3.conf
@@ -38,6 +38,7 @@
     },
     mesh_vpn = {
         tunneldigger = {
+            mtu = 1364,
             brokers = {
                 'vpn01-dom3.freifunk-neuss.de:12003',
                 'vpn02-dom3.freifunk-neuss.de:12003',
diff --git a/domains/ffneuss_dom4.conf b/domains/ffneuss_dom4.conf
index 2295050..99d6a41 100644
--- a/domains/ffneuss_dom4.conf
+++ b/domains/ffneuss_dom4.conf
@@ -38,6 +38,7 @@
     },
     mesh_vpn = {
         tunneldigger = {
+            mtu = 1364,
             brokers = {
                 'vpn01-dom4.freifunk-neuss.de:12004',
                 'vpn02-dom4.freifunk-neuss.de:12004',
diff --git a/domains/ffneuss_dom5.conf b/domains/ffneuss_dom5.conf
index 3300ef6..48ac649 100644
--- a/domains/ffneuss_dom5.conf
+++ b/domains/ffneuss_dom5.conf
@@ -39,6 +39,7 @@
     },
     mesh_vpn = {
         tunneldigger = {
+            mtu = 1364,
             brokers = {
                 'vpn01-dom5.freifunk-neuss.de:12005',
                 'vpn02-dom5.freifunk-neuss.de:12005',
diff --git a/domains/legacy.conf b/domains/legacy.conf
index 2707a35..4571e89 100644
--- a/domains/legacy.conf
+++ b/domains/legacy.conf
@@ -32,6 +32,7 @@
     },
     mesh_vpn = {
         tunneldigger = {
+            mtu = 1364,
             brokers = {
                 'vpn01.freifunk-duesseldorf.de:10050',
                 'vpn02.freifunk-duesseldorf.de:10050',
diff --git a/domains/legacy_neuss.conf b/domains/legacy_neuss.conf
index 7af083b..39eceb3 100644
--- a/domains/legacy_neuss.conf
+++ b/domains/legacy_neuss.conf
@@ -32,6 +32,7 @@
     },
     mesh_vpn = {
         tunneldigger = {
+            mtu = 1364,
             brokers = {
                 'supernode1.freifunk-neuss.de:10030',
                 'supernode2.freifunk-neuss.de:10030',
diff --git a/site.conf b/site.conf
index 4679270..7dcd13c 100644
--- a/site.conf
+++ b/site.conf
@@ -40,7 +40,6 @@
     },
     mesh_vpn = {
         enabled = true,
-        mtu = 1364,
         bandwidth_limit = {
             enabled = false,
             ingress = 3000,
@@ -57,7 +56,7 @@
                     'http://1.updates.freifunk-duesseldorf.de/stable/sysupgrade',
                     'http://2.updates.freifunk-duesseldorf.de/stable/sysupgrade',
                 },
-                good_signatures = 2,
+                good_signatures = 1,
                 pubkeys = {
                     'cb79f3377ad78c0782a38e0fb6fc2a34270ca4c89c9e971b201a89bf8ddcd96f', -- CyrusFox (Freifunk Düsseldorf)
                     'c1eb8c55dd21bc4882a67b2b1f3cb50c572288acc35e52b393212ebf2b40180b', -- nomaster (Freifunk Düsseldorf)

From 14e8620ecfcce06c1c69ea1eac95d428dffac483 Mon Sep 17 00:00:00 2001
From: Marcus Weiner <marcus.weiner@gmail.com>
Date: Mon, 12 Aug 2024 20:33:53 +0200
Subject: [PATCH 20/26] Build newer gluon

---
 .github/workflows/build.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 899f757..e311d74 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -4,8 +4,8 @@ on:
   push:
 
 env:
-  GLUON_RELEASE: v2021.1.2
-  PREVIEW_TARGETS: '["x86-64", "ar71xx-generic", "ar71xx-tiny"]'
+  GLUON_RELEASE: v2022.1.4
+  PREVIEW_TARGETS: '["x86-64", "ath79-generic"]'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

From b1fd8bca6bb90d5fc898e46744fa7f46f67e8080 Mon Sep 17 00:00:00 2001
From: Marcus Weiner <marcus.weiner@gmail.com>
Date: Mon, 12 Aug 2024 20:34:47 +0200
Subject: [PATCH 21/26] Upload artifacts

---
 .github/workflows/build.yaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index e311d74..25b22e3 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -82,6 +82,13 @@ jobs:
         if: failure() && steps.build.conclusion == 'failure'
         run: make -j1 V=sc GLUON_TARGET="${{ matrix.target }}"
 
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: images-${{ matrix.target }}
+          path: output/images/
+          compression-level: 1
+
       - name: Save toolchain cache
         uses: actions/cache/save@v4
         if: always()

From b3d1be61478224d2dbd77b662ec165b938658f8b Mon Sep 17 00:00:00 2001
From: Mic Szillat <mic@nomaster.cc>
Date: Mon, 12 Aug 2024 21:34:45 +0200
Subject: [PATCH 22/26] Update build.yaml

---
 .github/workflows/build.yaml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 25b22e3..1892764 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -7,9 +7,9 @@ env:
   GLUON_RELEASE: v2022.1.4
   PREVIEW_TARGETS: '["x86-64", "ath79-generic"]'
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+# concurrency:
+  # group: ${{ github.workflow }}-${{ github.ref }}
+  # cancel-in-progress: true
 
 jobs:
   gather_targets:
@@ -35,7 +35,8 @@ jobs:
   build:
     needs: gather_targets
     name: Build Images
-    runs-on: ubuntu-22.04
+    # runs-on: ubuntu-22.04
+    runs-on: self-hosted
     strategy:
       fail-fast: false
       matrix:

From 9da211431ee864af334864217afcd785ca44d8c1 Mon Sep 17 00:00:00 2001
From: Mic Szillat <mic@nomaster.cc>
Date: Mon, 12 Aug 2024 21:37:55 +0200
Subject: [PATCH 23/26] Update build.yaml

---
 .github/workflows/build.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 1892764..1517603 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -50,11 +50,11 @@ jobs:
         with:
           path: site
 
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get -y --no-install-recommends install \
-            python2
+      # - name: Install dependencies
+      #   run: |
+      #     sudo apt-get update
+      #     sudo apt-get -y --no-install-recommends install \
+      #       python2
 
       - name: Restore toolchain cache
         uses: actions/cache/restore@v4

From c39f5afdb3afded0e24190ce0d840ea33355260b Mon Sep 17 00:00:00 2001
From: Mic Szillat <mic@nomaster.cc>
Date: Mon, 12 Aug 2024 21:39:18 +0200
Subject: [PATCH 24/26] Update build.yaml

---
 .github/workflows/build.yaml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 1517603..f0bc6a1 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -50,11 +50,12 @@ jobs:
         with:
           path: site
 
-      # - name: Install dependencies
-      #   run: |
-      #     sudo apt-get update
-      #     sudo apt-get -y --no-install-recommends install \
-      #       python2
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get -y --no-install-recommends install \
+            # python2 \
+            build-essential
 
       - name: Restore toolchain cache
         uses: actions/cache/restore@v4

From c5f76164dc3284e779c81bf17b9f885df004347d Mon Sep 17 00:00:00 2001
From: Mic Szillat <mic@nomaster.cc>
Date: Mon, 12 Aug 2024 21:42:54 +0200
Subject: [PATCH 25/26] install *all* the dependencies!

---
 .github/workflows/build.yaml | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index f0bc6a1..6834f56 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -54,8 +54,21 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get -y --no-install-recommends install \
-            # python2 \
-            build-essential
+            git \
+            python3 \
+            python3-setuptools \
+            build-essential \
+            ecdsautils  \
+            gawk \
+            unzip \
+            libncurses-dev \
+            libz-dev  \
+            libssl-dev \
+            libelf-dev  \
+            wget \
+            rsync \
+            time  \
+            qemu-utils
 
       - name: Restore toolchain cache
         uses: actions/cache/restore@v4

From 3b3324ac16c65b9b708f3dab47db744e96bcbbf7 Mon Sep 17 00:00:00 2001
From: Mic Szillat <mic@nomaster.cc>
Date: Mon, 12 Aug 2024 22:05:34 +0200
Subject: [PATCH 26/26] Update build.yaml

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 6834f56..0d05b91 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -91,7 +91,7 @@ jobs:
 
       - name: Build Gluon Image
         id: build
-        run: make GLUON_TARGET="${{ matrix.target }}"
+        run: make -j16 GLUON_TARGET="${{ matrix.target }}"
 
       - name: Debug build failure
         if: failure() && steps.build.conclusion == 'failure'