[Backport next] sync next with older stable PRs

.github/workflows/firmware.yml

@@ -75,7 +75,7 @@ jobs:
       - build_firmware
     if: github.event_name != 'pull_request'
     steps:
-      - name: Download Artifacts for ${{ matrix.target }}
+      - name: Download all artifacts
         uses: actions/download-artifact@v3
       - name: Display structure of artifacts
         run: ls -R

.github/workflows/shellcheck.yml

@@ -1,6 +1,7 @@
 ---
 name: Shell Linting
-on:
+
+on:  # yamllint disable-line rule:truthy
   workflow_dispatch:
   push:
     branches:
@@ -21,7 +22,7 @@ jobs:
       - name: shellcheck
         # Make sure the action is pinned to a commit, as all reviewdog repos
         # have hundreds of contributors with write access (breaks easy/often)
-        uses: reviewdog/action-shellcheck@66c9a47bf02255b250284a82251cb4cadf5043f5  # v1.15.0
+        uses: reviewdog/action-shellcheck@50e5e1e2284575f23a1e409d9c0804cdfc4f6e31  # v1.18.1
         with:
           filter_mode: "file"
           fail_on_error: true

CHANGELOG.md

@@ -1,6 +1,29 @@
 # Freifunk München Firmware Changelog
 
-## V2021.7.3
+## Newer versions
+ Detailed changelog for versions v2022.5.1 and above can be found here:
+ https://github.com/freifunkMUC/site-ffm/releases
+
+## v2022.5.2
+ - Bump Gluon to v2021.1.2 https://gluon.readthedocs.io/en/v2021.1.x/releases/v2021.1.2.html
+
+## v2022.2.1
+ - Fix bug in wireguard package which was causing high CPU load if no WAN was available
+
+## v2021.12.1
+ - Change SSID on deprecated 4/32 devices to "bitte-router-erneuern.ffmuc.net"
+
+## v2021.10.3
+ - Add domain ffmuc_augsburg
+ - Move gluon-mesh-vpn-wireguard-vxlan to main branch and make broker URL configurable
+ - Fix firmware naming on custom builds, so autoupdater will no longer revert installation
+
+## v2021.8.1
+ - Bump Gluon to v2021.1.1 https://gluon.readthedocs.io/en/v2021.1.x/releases/v2021.1.1.html
+ - Set a defined outdoor_chanlist for wifi5
+ - Improve GitHub build process, enable automatic builds for pull requests
+
+## v2021.7.3
  - Migrate autoupdater branch "wireguard" to "experimental"
  - Remove "wireguard" autoupdater configuration, so it does no longer show up in config UI
  - Generate manifests for all current autoupdater branches in the build

Makefile

@@ -1,6 +1,6 @@
 GLUON_BUILD_DIR := gluon-build
 GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
-GLUON_GIT_REF := 21bf0fbf544d539e5678f64af90cf827dd81f9b5 # branch master
+GLUON_GIT_REF := v2023.1
 
 PATCH_DIR := ./patches
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key

README.md

@@ -25,20 +25,21 @@ make
 
 As the CI is using Ubuntu, only the Ubuntu dependencies are being tracked. To simplify building on other distros, containerised building is also possible:
 ```sh
-docker build -t site-ffm -f Dockerfile_build .
+docker build -t site-ffm-next -f Dockerfile_build .
 ```
 This will build the build Docker image. With the following export, the Makefile will then use the repo for building but will run inside an Ubuntu container.\
 **Note**: If the working directory is a git worktree, add a volume mount for the main git folder.
 ```sh
+mkdir -p gluon-build output
 docker run --rm -v $(pwd):/site-ffm:ro -v $(pwd)/gluon-build:/site-ffm/gluon-build:rw -v $(pwd)/output:/site-ffm/output:rw -w /site-ffm -u $UID site-ffm-next make
 ```
 
 #### Example
 Full command for a [lantiq-xrx200](https://github.com/freifunk-gluon/gluon/blob/v2022.1/targets/lantiq-xrx200) build:
 
 ```sh
-mkdir -p logs
-docker run --rm -v $(pwd):/site-ffm:ro -v $(pwd)/gluon-build:/site-ffm/gluon-build:rw -v $(pwd)/output:/site-ffm/output:rw -w /site-ffm -u $UID site-ffm-next make V=s BROKEN=1 GLUON_TARGETS=lantiq-xrx200 |& tee logs/buildtest_lantiq-xrx200_$(date --iso=s).log
+mkdir -p logs gluon-build output
+docker run --rm -v $(pwd):/site-ffm:ro -v $(pwd)/gluon-build:/site-ffm/gluon-build:rw -v $(pwd)/output:/site-ffm/output:rw -w /site-ffm -u $UID site-ffm-next make V=s GLUON_TARGETS=lantiq-xrx200 |& tee logs/build_lantiq-xrx200_$(date --iso=s).log
 ```
 
 ## Further Resources

contrib/genpkglist.py

@@ -206,9 +206,7 @@ def render(self):
         'tp-link-tl-wr1043nd-v4'
     ], pkglists=[PKGS_USB, PKGS_USB_NET, PKGS_USB_SERIAL, PKGS_USB_STORAGE]). \
     exclude([
-        'tp-link-re355-v1',
-        'tp-link-re450-v1',
-        'd-link-dir825b1'
+        'd-link-dir825b1',
     ], pkglists=[PKGS_TLS])
 
 for target in ['ath79-nand', 'ipq40xx-generic', 'ipq806x-generic', 'lantiq-xway', 'mpc85xx-p1010', 'mpc85xx-p1020', 'mvebu-cortexa9', 'rockchip-armv8', 'sunxi-cortexa7']:

site.mk

@@ -174,8 +174,6 @@ ifeq ($(GLUON_TARGET),ath79-generic)
     GLUON_tp-link-archer-c59-v1_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
     GLUON_tp-link-tl-wr842n-v3_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
     GLUON_tp-link-tl-wr1043nd-v4_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-    GLUON_tp-link-re355-v1_SITE_PACKAGES += $(EXCLUDE_TLS)
-    GLUON_tp-link-re450-v1_SITE_PACKAGES += $(EXCLUDE_TLS)
     GLUON_d-link-dir825b1_SITE_PACKAGES += $(EXCLUDE_TLS)
 endif