Merge branch 'freifunk-gluon:master' into master

.github/filters.yml

@@ -1,4 +1,26 @@
 {
+  "armsr-armv7": [
+    "targets/armsr-armv7",
+    ".github/workflows/build-gluon.yml",
+    "modules",
+    "Makefile",
+    "patches/**",
+    "scripts/**",
+    "targets/generic",
+    "targets/targets.mk",
+    "targets/armsr.inc"
+  ],
+  "armsr-armv8": [
+    "targets/armsr-armv8",
+    ".github/workflows/build-gluon.yml",
+    "modules",
+    "Makefile",
+    "patches/**",
+    "scripts/**",
+    "targets/generic",
+    "targets/targets.mk",
+    "targets/armsr.inc"
+  ],
   "ath79-generic": [
     "targets/ath79-generic",
     ".github/workflows/build-gluon.yml",
@@ -259,6 +281,17 @@
     "targets/targets.mk",
     "targets/bcm27xx.inc"
   ],
+  "bcm27xx-bcm2711": [
+    "targets/bcm27xx-bcm2711",
+    ".github/workflows/build-gluon.yml",
+    "modules",
+    "Makefile",
+    "patches/**",
+    "scripts/**",
+    "targets/generic",
+    "targets/targets.mk",
+    "targets/bcm27xx.inc"
+  ],
   "mvebu-cortexa9": [
     "targets/mvebu-cortexa9",
     ".github/workflows/build-gluon.yml",

.github/labeler.yml

@@ -6,7 +6,7 @@
 "3. topic: batman-adv":
   - docs/package/gluon-mesh-batman-adv*
   - package/gluon-alfred/**
-  - package/gluon-cient-bridge/**
+  - package/gluon-client-bridge/**
   - package/gluon-mesh-batman-adv/**
   - package/libbatadv/**
 "3. topic: build":
@@ -15,7 +15,7 @@
 "3. topic: config-mode":
   - docs/dev/web/config-mode.rst
   - docs/package/gluon-config-mode-*
-  - packge/gluon-config-mode-*/**
+  - package/gluon-config-mode-*/**
   - package/gluon-web*/**
 "3. topic: continous integration":
   - .github/workflows/*
@@ -56,4 +56,4 @@
   - package/gluon-private-wifi/**
   - package/gluon-web-private-wifi/**
   - package/gluon-web-wifi-config/**
-  - package/gluon-wireless-encryption/**
+  - package/gluon-wireless-encryption-wpa3/**

.github/workflows/backport.yml

@@ -9,11 +9,11 @@ jobs:
   backport:
     name: Backport Pull Request
     if: github.repository_owner == 'freifunk-gluon' && github.event.pull_request.merged == true && (github.event_name != 'labeled' || startsWith('backport', github.event.label.name))
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - name: Create backport PRs
-        uses: korthout/backport-action@v2.0.0
+        uses: korthout/backport-action@v2.1.1
         with:
           # Config README: https://github.com/korthout/backport-action#backport-action
           pull_description: |-

.github/workflows/build-container.yml

@@ -5,38 +5,44 @@ on:
   push:
     branches:
       - 'master'
+      - 'next'
       - 'v202[0-9].[0-9].x'
     tags:
       - 'v*'
   pull_request:
 
 env:
   REGISTRY: ghcr.io
-  IMAGE_NAME: gluon-build
+  IMAGE_NAME: ${{ github.repository }}-build
 
 jobs:
   build-and-push-image:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions: write-all
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
       - name: Log in to the Container registry
-        uses: docker/login-action@1f401f745bf57e30b3a2800ad308a87d2ebdf14b
+        uses: docker/login-action@3d58c274f17dffee475a5520cbe67f0a882c4dbb
         if: ${{ github.repository_owner == 'freifunk-gluon' && github.event_name == 'push' }}
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@62339db73c56dd749060f65a6ebb93a6e056b755
+        uses: docker/metadata-action@e6428a5c4e294a61438ed7f43155db912025b6b3
         with:
-          images: ${{ env.REGISTRY }}/freifunk-gluon/${{ env.IMAGE_NAME }}
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
       - name: Build and push Docker image
-        uses: docker/build-push-action@fdf7f43ecf7c1a5c7afe936410233728a8c2d9c2
+        uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56
         with:
           context: ./contrib/docker
           push: ${{ github.repository_owner == 'freifunk-gluon' && github.event_name == 'push' }}
+          platforms: linux/amd64,linux/arm64
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/build-docs.yml

@@ -15,7 +15,7 @@ permissions:
 jobs:
   build-documentation:
     name: docs
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - name: Install Dependencies

.github/workflows/build-gluon.yml

@@ -17,7 +17,7 @@ jobs:
     permissions:
       contents: read  # for dorny/paths-filter to fetch a list of changed files
       pull-requests: read  # for dorny/paths-filter to read pull requests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     outputs:
       targets: ${{ steps.filter.outputs.changes }}
     steps:
@@ -37,18 +37,18 @@ jobs:
       matrix:
         # Read back changed targets to create build matrix
         target: ${{ fromJSON(needs.changed.outputs.targets) }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
 
       - name: Show system information
         run: contrib/actions/show-system-info.sh
 
-      - name: Install Dependencies
-        run: sudo contrib/actions/install-dependencies.sh
+      - name: Build Docker container
+        run: docker build -t gluon-ci-container contrib/docker
 
-      - name: Build
-        run: contrib/actions/run-build.sh ${{ matrix.target }}
+      - name: Build Gluon
+        run: docker run --rm -v $PWD:/gluon-ci -w /gluon-ci --user "$(id -u):$(id -g)" gluon-ci-container contrib/actions/run-build.sh ${{ matrix.target }}
 
       - name: Archive build logs
         if: ${{ !cancelled() }}

.github/workflows/check-ci.yml

@@ -9,7 +9,7 @@ permissions:
 jobs:
   check-ci:
     name: Check generated CI
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - name: Install example site

.github/workflows/check-patches.yml

@@ -18,7 +18,7 @@ permissions:
 jobs:
   check-patches:
     name: Check patches
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - name: Refresh patches

.github/workflows/labels.yml

@@ -12,7 +12,7 @@ jobs:
     permissions:
       contents: read  # for actions/labeler to determine modified files
       pull-requests: write  # for actions/labeler to add labels to PRs
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: github.repository_owner == 'freifunk-gluon'
     steps:
     - uses: actions/labeler@v4

.github/workflows/lint.yml

@@ -9,7 +9,7 @@ permissions:
 jobs:
   lua:
     name: Lua
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - name: Install Dependencies
@@ -21,7 +21,7 @@ jobs:
 
   sh:
     name: Shell
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - name: Install Dependencies
@@ -33,7 +33,7 @@ jobs:
 
   editorconfig:
     name: Editorconfig
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - name: Install Dependencies

Makefile

@@ -54,7 +54,9 @@ $(eval $(call mkabspath,GLUON_TARGETSDIR))
 $(eval $(call mkabspath,GLUON_PATCHESDIR))
 
 GLUON_VERSION := $(shell scripts/getversion.sh '.')
-GLUON_SITE_VERSION := $(shell scripts/getversion.sh '$(GLUON_SITEDIR)')
+
+# Set default SITE_VERSION if not set by user
+GLUON_SITE_VERSION ?= $(shell scripts/getversion.sh '$(GLUON_SITEDIR)')
 
 GLUON_MULTIDOMAIN ?= 0
 GLUON_AUTOREMOVE ?= 0

contrib/docker/Dockerfile

@@ -1,5 +1,8 @@
 FROM debian:bookworm-slim
 
+ARG TARGETOS
+ARG TARGETARCH
+
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y --no-install-recommends \
     ca-certificates \
@@ -27,9 +30,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     && rm -rf /var/lib/apt/lists/*
 
 RUN mkdir /tmp/ec &&\
-    wget -O /tmp/ec/ec-linux-amd64.tar.gz https://github.com/editorconfig-checker/editorconfig-checker/releases/download/2.7.0/ec-linux-amd64.tar.gz &&\
-    tar -xvzf /tmp/ec/ec-linux-amd64.tar.gz &&\
-    mv bin/ec-linux-amd64 /usr/local/bin/editorconfig-checker &&\
+    wget -O /tmp/ec/ec-${TARGETOS}-${TARGETARCH}.tar.gz https://github.com/editorconfig-checker/editorconfig-checker/releases/download/2.7.0/ec-${TARGETOS}-${TARGETARCH}.tar.gz &&\
+    tar -xvzf /tmp/ec/ec-${TARGETOS}-${TARGETARCH}.tar.gz &&\
+    mv bin/ec-${TARGETOS}-${TARGETARCH} /usr/local/bin/editorconfig-checker &&\
     rm -rf /tmp/ec
 
 RUN useradd -m -d /gluon -u 100 -g 100 -o gluon

contrib/push_pkg.sh

@@ -10,7 +10,7 @@ build_only=0
 preserve_config=1
 
 print_help() {
-	echo "$0 [OPTIONS] PACAKGE_DIR [PACKAGE_DIR] ..."
+	echo "$0 [OPTIONS] PACKAGE_DIR [PACKAGE_DIR] ..."
 	echo ""
 	echo " -h          print this help"
 	echo " -r HOST     use a remote machine as target machine. By default if this"

docs/multidomain-site-example/site.mk

@@ -17,18 +17,20 @@ GLUON_FEATURES := \
 	web-advanced \
 	web-wizard
 
+GLUON_FEATURES_standard := \
+	wireless-encryption-wpa3
+
 ##	GLUON_MULTIDOMAIN
 #		Build gluon with multidomain support.
 
 GLUON_MULTIDOMAIN=1
 
 ##	GLUON_SITE_PACKAGES
-#		Specify additional Gluon/LEDE packages to include here;
+#		Specify additional Gluon/OpenWrt packages to include here;
 #		A minus sign may be prepended to remove a packages from the
 #		selection that would be enabled by default or due to the
 #		chosen feature flags
 
-
 GLUON_SITE_PACKAGES := iwinfo
 
 ##	DEFAULT_GLUON_RELEASE

docs/releases/v2023.1.1.rst

@@ -9,6 +9,10 @@ Important notes
 
 Upgrades to this version are only supported from releases v2021.1 and later.
 
+**Note:**
+This release was found to be soft-bricking AVM Fritz!Box 7520 and 7530.
+We advice to not offer the release for these two devices until this gets fixed.
+Affected devices can be recovered to Fritz!OS and then reinstalled by using the (`AVM Recovery Tool <http://ftp.avm.de/fritzbox/fritzbox-7530/other/recover/>`_)
 
 Bugfixes
 --------
@@ -53,3 +57,6 @@ Known issues
   (`#2967 <https://github.com/freifunk-gluon/gluon/issues/2967>`_).
 
   It is planned that the next major release will reintroduce EFI support.
+
+* AVM Fritz!Box 7520 and 7530 get soft-bricked by this release. The issue was introduced by a kernel bump.
+  (`#3023 <https://github.com/freifunk-gluon/gluon/issues/3023>`_)

docs/requirements.txt

@@ -1 +1,2 @@
-sphinx-rtd-theme==1.3.0
+Sphinx==7.1.2
+sphinx-rtd-theme==2.0.0

docs/user/getting_started.rst

@@ -237,6 +237,11 @@ GLUON_RELEASE
   is available. The same GLUON_RELEASE has to be passed to ``make`` and ``make manifest``
   to generate a correct manifest.
 
+GLUON_SITE_VERSION
+  Version of the site configuration. This string is displayed in the config mode
+  and `gluon-info`. If unset, Gluon generates a version string using `git describe`
+  on the site folder.
+
 GLUON_TARGET
   Target architecture to build.
 

docs/user/supported_devices.rst

@@ -1,6 +1,16 @@
 Supported Devices & Architectures
 =================================
 
+armsr-armv7
+-----------
+
+* Arm SystemReady (EFI) 32-bit
+
+armsr-armv8
+-----------
+
+* Arm SystemReady (EFI) 64-bit
+
 ath79-generic
 --------------
 
@@ -99,6 +109,11 @@ ath79-generic
 
   - WS-AP3610
 
+* Sophos
+
+  - AP100c
+  - AP55c
+
 * Teltonika
 
   - RUT230 (v1)
@@ -294,6 +309,10 @@ mediatek-filogic
 
   - WAX220
 
+* Ubiquiti
+
+  - UniFi 6 Plus
+
 * ZyXEL
 
   - NWA50AX Pro

modules

@@ -2,15 +2,15 @@ GLUON_FEEDS='gluon packages routing'
 
 OPENWRT_REPO=https://github.com/openwrt/openwrt.git
 OPENWRT_BRANCH=openwrt-23.05
-OPENWRT_COMMIT=7c43ced160a01ad2300bf103d457d9f2b20c2772
+OPENWRT_COMMIT=59fd8f08cf544a7f0fcaf700ca9af9292de3adcc
 
 PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git
-PACKAGES_GLUON_COMMIT=dc99bbb906f9faae472e48da013dbf67e1a00c23
+PACKAGES_GLUON_COMMIT=53ea3b89771fc7d7a80f1800ce25e98dfe1633aa
 
 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
 PACKAGES_PACKAGES_BRANCH=openwrt-23.05
-PACKAGES_PACKAGES_COMMIT=55aef54b755a3cb39cf9eb42513a2c3a3eeab36e
+PACKAGES_PACKAGES_COMMIT=4e9c89801b8171c5e926aa14eea63af623ae5798
 
 PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git
 PACKAGES_ROUTING_BRANCH=openwrt-23.05
-PACKAGES_ROUTING_COMMIT=83ef3784a9092cfd0a900cc28e2ed4e13671d667
+PACKAGES_ROUTING_COMMIT=81cdbd3b62ed07834a8cd2203adb73fc358f8271