Merge pull request #339 from grische/feature/image-customizations

Bump Gluon to v2023.2 and remove x86-64 workaround

.github/workflows/firmware.yml

@@ -50,12 +50,6 @@ jobs:
       - name: Install build dependencies
         run: |
           sudo -E ./scripts/install_build_dependencies.sh
-      - name: pre-build without ffmuc-mesh-vpn-wireguard-vxlan (workaround for x86-64)
-        if: matrix.target == 'x86-64'
-        run: |
-          sed -i '/ffmuc-mesh-vpn-wireguard-vxlan/d' site.mk
-          make BROKEN=1 GLUON_TARGETS=${{ matrix.target }} V=s
-          git checkout site.mk
       - name: build target ${{ matrix.target }}
         id: compile
         run: |

Makefile

@@ -1,6 +1,6 @@
 GLUON_BUILD_DIR := gluon-build
 GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
-GLUON_GIT_REF := dc841ea4a37b4e74777e07617042bc92aad2483b # master at 2023-12-13
+GLUON_GIT_REF := v2023.2
 
 PATCH_DIR := ./patches
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key