From 932dfba35e47eb3097f9306e865159940ffadedd Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 17 Oct 2022 20:29:52 +0200
Subject: [PATCH] Updates for gluon v2022.1

---
 README.md  | 1 +
 build.conf | 4 ++--
 site.conf  | 2 +-
 site.mk    | 1 -
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 53cbfb6..773f866 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
 
 #### Gluon versions used for specific Hamburg Freifunk Firmware builds
 
+- v2022.1.0.0: site-ffhh: v2022.1.0.0, gluon: v2022.1
 - v2021.1.2.0: site-ffhh: v2021.1.2.0, gluon: v2021.1.2
 - v2021.1.1.0: site-ffhh: v2021.1.1.0, gluon: v2021.1.1
 - v2020.2.3.0: site-ffhh: v2020.2.3.0, gluon: v2020.2.3
diff --git a/build.conf b/build.conf
index 13f862f..282bef3 100644
--- a/build.conf
+++ b/build.conf
@@ -1,5 +1,5 @@
-GLUON_RELEASE="v2021.1.2.0"
-targets="ar71xx-generic ar71xx-nand ar71xx-tiny ath79-generic brcm2708-bcm2708 brcm2708-bcm2709 ipq40xx-generic ipq806x-generic lantiq-xrx200 lantiq-xway mpc85xx-generic mpc85xx-p1020 ramips-mt7620 ramips-mt7621 ramips-mt76x8 ramips-rt305x x86-64 x86-generic x86-geode x86-legacy"
+GLUON_RELEASE="v2022.1.0.0"
+targets="ath79-generic ath79-nand ath79-mikrotik bcm27xx-bcm2708 bcm27xx-bcm2709 ipq40xx-generic ipq40xx-mikrotik ipq806x-generic lantiq-xrx200 lantiq-xway mediatek-mt7622 mpc85xx-p1010 mpc85xx-p1020 ramips-mt7620 ramips-mt7621 ramips-mt76x8 rockchip-armv8 sunxi-cortexa7 x86-generic x86-geode x86-legacy x86-64"
 broken_images=(
 	'*dir*615*d*'
 )
diff --git a/site.conf b/site.conf
index d1432a8..04919a0 100644
--- a/site.conf
+++ b/site.conf
@@ -39,9 +39,9 @@
 
 	mesh_vpn = {
 		enabled = true,
-		mtu = 1312,
 		fastd = {
 			configurable = true,
+			mtu = 1312,
 			methods = {'salsa2012+umac'},
 			groups = {
 				backbone = {
diff --git a/site.mk b/site.mk
index 2d6fb10..419cb23 100644
--- a/site.mk
+++ b/site.mk
@@ -8,7 +8,6 @@ GLUON_SITE_PACKAGES := \
 	-gluon-config-mode-contact-info \
 	gluon-ebtables-source-filter \
 	gluon-web-mesh-vpn-fastd \
-	iptables \
 	iwinfo
 
 GLUON_FEATURES := \