v2023.2.4 and dockerized build

V2023.1.x

.gitignore

@@ -0,0 +1,4 @@
+site-ffrgb.code-workspace
+gluon-build
+output
+

Makefile

@@ -1,39 +1,29 @@
 GLUON_BUILD_DIR := gluon-build
 GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon
-GLUON_GIT_REF := v2018.1
+GLUON_GIT_REF := v2023.2.4
+
+PATCH_DIR := ./patches
 
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
 
-GLUON_TARGETS ?= \
-	ar71xx-generic \
-	x86-64 \
-	ar71xx-tiny \
-	ar71xx-nand \
-	brcm2708-bcm2708 \
-	brcm2708-bcm2709 \
-	mpc85xx-generic \
-	ramips-mt7621 \
-	ramips-rt305x \
-	x86-64 \
-	x86-generic \
-	x86-geode \
-	sunxi
+GLUON_TARGETS ?= $(shell cat targets | tr '\n' ' ')
 
-
-GLUON_RELEASE := $(shell git describe --tags 2>/dev/null)
 ifneq (,$(shell git describe --exact-match --tags 2>/dev/null))
-  GLUON_BRANCH := stable
+	GLUON_AUTOUPDATER_ENABLED := 1
+	GLUON_RELEASE := $(shell git describe --tags 2>/dev/null)
 else
-  GLUON_BRANCH := experimental
+	GLUON_AUTOUPDATER_ENABLED := 0
+	EXP_FALLBACK = $(shell date '+%Y%m%d')
+	BUILD_NUMBER ?= $(EXP_FALLBACK)
+	GLUON_RELEASE := $(shell git describe --tags)~exp$(BUILD_NUMBER)
 endif
 
 JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l)
 
-#JOBS = 1
-
-GLUON_MAKE := ${MAKE} BROKEN=0 -j ${JOBS} -C ${GLUON_BUILD_DIR} \
-			GLUON_RELEASE=${GLUON_RELEASE} \
-			GLUON_BRANCH=${GLUON_BRANCH} \
+GLUON_MAKE := ${MAKE} -j ${JOBS} -C ${GLUON_BUILD_DIR} \
+	GLUON_RELEASE=${GLUON_RELEASE} \
+	GLUON_AUTOUPDATER_BRANCH=${GLUON_AUTOUPDATER_BRANCH} \
+	GLUON_AUTOUPDATER_ENABLED=${GLUON_AUTOUPDATER_ENABLED}
 
 
 all: info
@@ -42,46 +32,52 @@ all: info
 info:
 	@echo
 	@echo '#########################'
-	@echo '# FFRGB Firmare build'
-	@echo '# Building release ${GLUON_RELEASE} for branch ${GLUON_BRANCH}'
-	@echo '# make params: ${GLUON_MAKE}'
+	@echo '# FFRGB Firmware build'
+	@echo '# Building release ${GLUON_RELEASE} for branch ${GLUON_AUTOUPDATER_BRANCH}'
 	@echo
 
-build: gluon-prepare
+build: gluon-prepare output-clean
 	for target in ${GLUON_TARGETS}; do \
 		echo ""Building target $$target""; \
-		${GLUON_MAKE} GLUON_TARGET="$$target"; \
+		${GLUON_MAKE} download all GLUON_TARGET="$$target"; \
 	done
 
-buildonly:
-	for target in ${GLUON_TARGETS}; do \
-                echo ""Building target $$target""; \
-                ${GLUON_MAKE} GLUON_TARGET="$$target"; \
-	done
-
-
 manifest: build
-	${GLUON_MAKE} manifest
-	mv ${GLUON_BUILD_DIR}/output .
+	for branch in next experimental testing stable; do \
+		${GLUON_MAKE} manifest GLUON_AUTOUPDATER_BRANCH=$$branch;\
+	done
+	mv -f ${GLUON_BUILD_DIR}/output/* ./output/
 
 sign: manifest
-	${GLUON_BUILD_DIR}/contrib/sign.sh ${SECRET_KEY_FILE} images/sysupgrade/${GLUON_BRANCH}.manifest
+	${GLUON_BUILD_DIR}/contrib/sign.sh ${SECRET_KEY_FILE} output/images/sysupgrade/${GLUON_AUTOUPDATER_BRANCH}.manifest
 
 ${GLUON_BUILD_DIR}:
-	git clone ${GLUON_GIT_URL} ${GLUON_BUILD_DIR}
+	mkdir -p ${GLUON_BUILD_DIR}
 
-gluon-prepare: images-clean ${GLUON_BUILD_DIR}
-	(cd ${GLUON_BUILD_DIR} \
-	  && git remote set-url origin ${GLUON_GIT_URL} \
-	  && git fetch origin \
-	  && git checkout -q ${GLUON_GIT_REF})
+# Note: "|" means "order only", e.g. "do not care about folder timestamps"
+# https://www.gnu.org/savannah-checkouts/gnu/make/manual/html_node/Prerequisite-Types.html
+${GLUON_BUILD_DIR}/.git: | ${GLUON_BUILD_DIR}
+	git init ${GLUON_BUILD_DIR}
+	cd ${GLUON_BUILD_DIR} && git remote add origin ${GLUON_GIT_URL}
+
+gluon-update: | ${GLUON_BUILD_DIR}/.git
+	cd ${GLUON_BUILD_DIR} && git fetch --tags origin ${GLUON_GIT_REF}
+	cd ${GLUON_BUILD_DIR} && git reset --hard FETCH_HEAD
+	cd ${GLUON_BUILD_DIR} && git clean -fd
+
+gluon-prepare: gluon-update
+	make gluon-patch
 	ln -sfT .. ${GLUON_BUILD_DIR}/site
 	${GLUON_MAKE} update
 
+gluon-patch:
+	scripts/apply_patches.sh ${GLUON_BUILD_DIR} ${PATCH_DIR}
+
 gluon-clean:
 	rm -rf ${GLUON_BUILD_DIR}
 
-images-clean:
-	rm -rf images
+output-clean:
+	mkdir -p output/
+	rm -rf output/*
 
-clean: gluon-clean images-clean
+clean: gluon-clean output-clean

README.md

@@ -1,11 +1,27 @@
 ## Building
 
+You need to have some prerequisits:
+
+    apt install build-essential gawk unzip libncurses-dev libz-dev libssl-dev wget git subversion
+
 Check out this repository and execute `make`, i.e. like this:
 
     git clone https://github.com/ffrgb/site-ffrgb.git site-ffrgb
     cd site-ffrgb
     make
 
+### Quick Hints
+
+Some common useful parameters for make:
+
+    GLUON_TARGETS=ar71xx-generic - Only build the specified architecture
+    GLUON_GIT_REF=v2018.2.x - wich Gluon-Release version to build
+    FORCE_UNSAFE_CONFIGURE=1 - If You build as root in an disposable environment You don't care about
+    BROKEN=1 - Also build for untested but defined hardware wich may not work
+    V=s - Print more information
+
+Think about starting Your make process inside a `screen` session as it usually takes a long time to build.
+
 ## Further Resources
 
 Look at the [site configuration related Gluon documentation](http://gluon.readthedocs.org/en/v2016.2.3/user/site.html)

dockerfile_build

@@ -0,0 +1,6 @@
+FROM ubuntu:22.04
+
+ADD ./scripts/install_build_dependencies.sh /
+RUN /install_build_dependencies.sh \
+    && apt-get clean \
+    && rm -r /var/lib/apt/lists/*

domains/ffrgb.conf

@@ -1,109 +0,0 @@
-{
-  domain_names = { ffrgb = 'Legacy' },
-  domain_seed = 'c8951e3a104d55543da98ee732468ea121878e77c6d18cbcbefb5409c292601a',
-  hide_domain = true,
-
-  opkg = {
-    --[[ old
-    openwrt = 'http://downloads.openwrt.org/%n/%v/%S/packages',
-    ]]
-    lede = 'http://downloads.lede-project.org/snapshots/packages/%A',
-  },
-
-  prefix4 = '10.90.0.0/19',
-  prefix6 = 'fdef:f00f:1337:cafe::/64',
-
-  ntp_servers = {'1.ntp.services.ffrgb','2.ntp.services.ffrgb'},
-
-  wifi24 = {
-    channel = 1,
-    ap = {
-      ssid = 'regensburg.freifunk.net',
-    },
-    ibss = {
-      ssid = 'mesh.ffrgb',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
-  },
-
-  wifi5 = {
-    channel = 44,
-    ap = {
-      ssid = 'regensburg.freifunk.net',
-    },
-    ibss = {
-      ssid = 'mesh.ffrgb',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    }
-  },
-
-  dns = {
-    cacheentries = 500,
-    servers = { 'fdef:f00f:1337:cafe::11', },
-  },
-
-  next_node = {
-    name = { 'nextnode.ffrgb', 'nextnode', 'nn' },
-    ip4 = '10.90.0.1',
-    ip6 = 'fdef:f00f:1337:cafe::1',
-    mac = '16:41:95:40:f7:dd',
-  },
-
-  mesh = {
-    vxlan = false,
-    filter_membership_reports = false,
-    batman_adv = {
-      gw_sel_class = 1,
-    },
-  },
-
-  mesh_vpn = {
-    mtu = 1426,
-    fastd = {
-      groups = {
-        backbone = {
-          limit = 2,
-          peers = {
-            gw01 = {   --[[ sven ]]
-              key = '58c2ac30c4693e8fde59c3794ac4c09748ec6a969e9688c42e144f5382e16e66',
-              remotes = {
-                'ipv4 "78.47.168.108" port 10000',
-              },
-            },
-            gw02 = {   --[[ alamar ]]
-              key = 'aa87e56e1e4d54fc8f4bfac755216425916d188d6fafc6a66ff90272c6b64214',
-              remotes = {
-                'ipv4 "185.53.218.23" port 10000',
-              },
-            },
-            gw04 = {   --[[ mephisto ]]
-              key = '40ebfaf04da006d9150d3d8adeaab0dfa62ca645b416403537cb009bbf2125b5',
-              remotes = {
-                'ipv4 "213.166.225.5" port 10000',
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-
-  autoupdater = {
-    enabled = 1,
-    branches = {
-      stable = {
-        mirrors = {
-          'http://fw.services.ffrgb/firmware-ng/stable/sysupgrade/',
-        },
-      },
-      experimental = {
-        mirrors = {
-          'http://fw.services.ffrgb/firmware-ng/experimental/sysupgrade/',
-        },
-      },
-    },
-  },
-}
--- vim: set ft=lua:ts=2:sw=2:et

domains/ffrgb_cty.conf

@@ -2,18 +2,9 @@
   domain_names = { ffrgb_cty = 'Regensburg Stadt' },
   domain_seed = '1124de9b0fe2dde424c8a4c481816b5899e6d1b4b4cf72de42136c4f1f197c7a',
 
-  opkg = {
-    --[[ old
-    openwrt = 'http://downloads.openwrt.org/%n/%v/%S/packages',
-    ]]
-    lede = 'http://downloads.lede-project.org/snapshots/packages/%A',
-  },
-
   prefix4 = '10.90.32.0/19',
   prefix6 = 'fdef:f10f:1337:cafe::/64',
-  extra_prefixes6 = {'2a00:9d80:6000:0101::/64'},
-
-  ntp_servers = {'1.ntp.services.ffrgb','2.ntp.services.ffrgb'},
+  extra_prefixes6 = {'2a00:9d80:6000:0101::/64', '2001:678:ddc:11::/64', '2001:678:e64:12::/64'},
 
   wifi24 = {
     channel = 1,
@@ -21,10 +12,8 @@
     ap = {
       ssid = 'regensburg.freifunk.net',
     },
-    ibss = {
-      ssid = 'mesh.ffrgb_cty',
-      bssid = '02:0E:8E:1E:61:01',
-      mcast_rate = 12000,
+    mesh = {
+      id = 'loo23eWueg11s',
     },
   },
 
@@ -34,11 +23,9 @@
     ap = {
       ssid = 'regensburg.freifunk.net',
     },
-    ibss = {
-      ssid = 'mesh.ffrgb_cty',
-      bssid = '02:0E:8E:1E:61:01',
-      mcast_rate = 12000,
-    }
+    mesh = {
+      id = 'loo23eWueg11s',
+    },
   },
 
   dns = {
@@ -58,11 +45,25 @@
     filter_membership_reports = false,
     batman_adv = {
       gw_sel_class = 1,
+      routing_algo = 'BATMAN_IV',
     },
   },
 
   mesh_vpn = {
     mtu = 1312,
+    wireguard = {
+      enabled = 'true',
+      iface = 'wg_mesh_vpn',
+      limit = '1', -- actually unused
+      peers = {
+        {
+          publickey ='zqBVQJlzkZxk5YT04dv4cIrYoDYpx0xBxK/6gV2PZXE=',
+          endpoint ='gw11.ffrgb.net:20010',
+          broker ='gw11.ffrgb.net',
+          link_address='fe80::11',
+        },
+      },
+    },
     fastd = {
       groups = {
         backbone = {
@@ -77,12 +78,6 @@
                 '"gw11.regensburg.freifunk.net" port 10010',
                 '"gw11.regensburg.freifunk.net" port 10011',
                 '"gw11.regensburg.freifunk.net" port 10012',
-                'ipv6 "2a00:9d80:8000:2007::131" port 10010',
-                'ipv6 "2a00:9d80:8000:2007::131" port 10011',
-                'ipv6 "2a00:9d80:8000:2007::131" port 10012',
-                'ipv4 "185.53.218.131" port 10010',
-                'ipv4 "185.53.218.131" port 10011',
-                'ipv4 "185.53.218.131" port 10012',
               },
             },
             gwsec = {   --[[ coldstandby ]]
@@ -107,12 +102,12 @@
     branches = {
       stable = {
         mirrors = {
-          'http://fw.services.ffrgb/firmware-ng/stable/sysupgrade/',
+          'http://fw.services.ffrgb/firmware-11s/stable/sysupgrade/',
         },
       },
       experimental = {
         mirrors = {
-          'http://fw.services.ffrgb/firmware-ng/experimental/sysupgrade/',
+          'http://fw.services.ffrgb/firmware-11s/experimental/sysupgrade/',
         },
       },
     },

domains/ffrgb_tst.conf

@@ -3,18 +3,9 @@
   domain_seed = 'bcd0ceca2c68b5b9a5975156a0ec0a04aebe3300d9928a04dc57001cc96db252',
   hide_domain = true,
 
-  opkg = {
-    --[[ old
-    openwrt = 'http://downloads.openwrt.org/%n/%v/%S/packages',
-    ]]
-    lede = 'http://downloads.lede-project.org/snapshots/packages/%A',
-  },
-
   prefix4 = '10.90.96.0/19',
   prefix6 = 'fdef:f30f:1337:cafe::/64',
-  extra_prefixes6 = {'2a00:9d80:6000:0103::/64'},
-
-  ntp_servers = {'1.ntp.services.ffrgb','2.ntp.services.ffrgb'},
+  extra_prefixes6 = {'2a00:9d80:6000:0103::/64', '2001:678:ddc:31::/64', '2001:678:e64:32::/64'},
 
   wifi24 = {
     channel = 1,
@@ -22,10 +13,8 @@
     ap = {
       ssid = 'test.ffrgb.net',
     },
-    ibss = {
-      ssid = 'mesh.ffrgb_test',
-      bssid = '02:0E:8E:1E:61:03',
-      mcast_rate = 12000,
+    mesh = {
+      id = 'mesh_ffrgb_tst_11s',
     },
   },
 
@@ -33,13 +22,11 @@
     channel = 44,
     htmode = 'HT20',
     ap = {
-      ssid = 'test.freifunk.net',
+      ssid = 'test.ffrgb.net',
+    },
+    mesh = {
+      id = 'mesh_ffrgb_tst_11s',
     },
-    ibss = {
-      ssid = 'mesh.ffrgb_test',
-      bssid = '02:0E:8E:1E:61:03',
-      mcast_rate = 12000,
-    }
   },
 
   dns = {
@@ -59,11 +46,25 @@
     filter_membership_reports = false,
     batman_adv = {
       gw_sel_class = 1,
+      routing_algo = 'BATMAN_IV',
     },
   },
 
   mesh_vpn = {
     mtu = 1312,
+    wireguard = {
+      enabled = 'true',
+      iface = 'wg_mesh_vpn',
+      limit = '1', -- actually unused
+      peers = {
+        {
+          publickey ='SfVwYUjy2b9AZ+R/JTwmLXz5jm1UEmnfuRMGpN9B4X4=',
+          endpoint ='gw31.ffrgb.net:20030',
+          broker ='gw31.ffrgb.net',
+          link_address='fe80::31',
+        },
+      },
+    },
     fastd = {
       groups = {
         backbone = {
@@ -78,12 +79,6 @@
                 '"gw31.regensburg.freifunk.net" port 10030',
                 '"gw31.regensburg.freifunk.net" port 10031',
                 '"gw31.regensburg.freifunk.net" port 10032',
-                'ipv6 "2a00:9d80:8000:2007::133" port 10030',
-                'ipv6 "2a00:9d80:8000:2007::133" port 10030',
-                'ipv6 "2a00:9d80:8000:2007::133" port 10030',
-                'ipv4 "185.53.218.133" port 10030',
-                'ipv4 "185.53.218.133" port 10031',
-                'ipv4 "185.53.218.133" port 10032',
               },
             },
             gwsec = {   --[[ coldstandby ]]
@@ -104,16 +99,16 @@
   },
 
   autoupdater = {
-    enabled = 1,
+    enabled = 0,
     branches = {
       stable = {
         mirrors = {
-          'http://fw.services.ffrgb/firmware-ng/stable/sysupgrade/',
+          'http://fw.services.ffrgb/firmware-11s/stable/sysupgrade/',
         },
       },
       experimental = {
         mirrors = {
-          'http://fw.services.ffrgb/firmware-ng/experimental/sysupgrade/',
+          'http://fw.services.ffrgb/firmware-11s/experimental/sysupgrade/',
         },
       },
     },

domains/ffrgb_uml.conf

@@ -2,18 +2,9 @@
   domain_names = { ffrgb_uml = 'Regensburg Umland' },
   domain_seed = 'f3d54e3dfc4108dd3356664bbab4baef3b2920ad943c27edce4b284a68e776fd',
 
-  opkg = {
-    --[[ old
-    openwrt = 'http://downloads.openwrt.org/%n/%v/%S/packages',
-    ]]
-    lede = 'http://downloads.lede-project.org/snapshots/packages/%A',
-  },
-
   prefix4 = '10.90.64.0/19',
   prefix6 = 'fdef:f20f:1337:cafe::/64',
-  extra_prefixes6 = {'2a00:9d80:6000:0102::/64'},
-
-  ntp_servers = {'1.ntp.services.ffrgb','2.ntp.services.ffrgb'},
+  extra_prefixes6 = {'2a00:9d80:6000:0102::/64', '2001:678:ddc:21::/64', '2001:678:e64:22::/64'},
 
   wifi24 = {
     channel = 1,
@@ -21,10 +12,8 @@
     ap = {
       ssid = 'land.regensburg.freifunk.net',
     },
-    ibss = {
-      ssid = 'mesh.ffrgb_uml',
-      bssid = '02:0E:8E:1E:61:02',
-      mcast_rate = 12000,
+    mesh = {
+      id = 'Ishei42esh11s',
     },
   },
 
@@ -32,13 +21,11 @@
     channel = 44,
     htmode = 'HT20',
     ap = {
-      ssid = 'regensburg.freifunk.net',
+      ssid = 'land.regensburg.freifunk.net',
+    },
+    mesh = {
+      id = 'Ishei42esh11s',
     },
-    ibss = {
-      ssid = 'mesh.ffrgb_uml',
-      bssid = '02:0E:8E:1E:61:02',
-      mcast_rate = 12000,
-    }
   },
 
   dns = {
@@ -58,11 +45,25 @@
     filter_membership_reports = false,
     batman_adv = {
       gw_sel_class = 1,
+      routing_algo = 'BATMAN_IV',
     },
   },
 
   mesh_vpn = {
     mtu = 1312,
+    wireguard = {
+      enabled = 'true',
+      iface = 'wg_mesh_vpn',
+      limit = '1', -- actually unused
+      peers = {
+        {
+          publickey ='MqzXEqO4US16rSGxsF2oHuSdMAy/Qimy+GUSeCob+U0=',
+          endpoint ='gw21.ffrgb.net:20020',
+          broker ='gw21.ffrgb.net',
+          link_address='fe80::21',
+        },
+      },
+    },
     fastd = {
       groups = {
         backbone = {
@@ -77,12 +78,6 @@
                 '"gw21.regensburg.freifunk.net" port 10020',
                 '"gw21.regensburg.freifunk.net" port 10021',
                 '"gw21.regensburg.freifunk.net" port 10022',
-                'ipv6 "2a00:9d80:8000:2007::132" port 10020',
-                'ipv6 "2a00:9d80:8000:2007::132" port 10021',
-                'ipv6 "2a00:9d80:8000:2007::132" port 10022',
-                'ipv4 "185.53.218.132" port 10020',
-                'ipv4 "185.53.218.132" port 10021',
-                'ipv4 "185.53.218.132" port 10022',
               },
             },
             gwsec = {   --[[ coldstandby ]]
@@ -107,12 +102,12 @@
     branches = {
       stable = {
         mirrors = {
-          'http://fw.services.ffrgb/firmware-ng/stable/sysupgrade/',
+          'http://fw.services.ffrgb/firmware-11s/stable/sysupgrade/',
         },
       },
       experimental = {
         mirrors = {
-          'http://fw.services.ffrgb/firmware-ng/experimental/sysupgrade/',
+          'http://fw.services.ffrgb/firmware-11s/experimental/sysupgrade/',
         },
       },
     },

i18n/de.po

@@ -63,7 +63,7 @@ msgstr ""
 "Betrieb für drei Sekunden den Reset-Button. Das Gerät wird dann im Config "
 "Mode neustarten.</p>"
 "<p>Wenn Du mehr über Freifunk in Regensburg erfahren möchtest, dann besuche "
-"uns doch einfach Montag in der <a href=\"http://www.binary-kitchen.de\">Binary Kitchen</a> "
-"wo meistens jemand von uns jemand zugegen ist, oder im "
+"uns doch einfach Montag abends in der <a href=\"http://www.binary-kitchen.de\">Binary Kitchen</a> "
+"wo meistens jemand von uns zugegen ist, oder im "
 "<a href=\"https://webirc.hackint.org/#irc://irc.hackint.org/#freifunkRGB\">IRC Netz</a></p> "
 "<p>Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!</p> "

modules

@@ -1,4 +1,7 @@
-GLUON_SITE_FEEDS='ffrgb'
+GLUON_SITE_FEEDS='ffrgb community'
 PACKAGES_FFRGB_REPO=https://github.com/ffrgb/gluon-packages.git
 PACKAGES_FFRGB_BRANCH=master
-PACKAGES_FFRGB_COMMIT=af2c608f31e264a279b919814896e4470c455e72
+PACKAGES_FFRGB_COMMIT=49d44d2fcad156e3b7d7234f42f7b6f091e16152
+PACKAGES_COMMUNITY_REPO=https://github.com/ffrgb/community-packages.git
+PACKAGES_COMMUNITY_BRANCH=gluon-mesh-vpn-wireguard-vxlan
+PACKAGES_COMMUNITY_COMMIT=ae20a79ff283998fb5cc9625dbc42903ae5f18e9

patches/targets-drop-TP-Link-RE450-and-RE355.patch

@@ -0,0 +1,41 @@
+From b5fb157e3b67b2d39f5b7c391ef39f0b19e4cf2e Mon Sep 17 00:00:00 2001
+From: Christian <github@grische.xyz>
+Date: Fri, 18 Aug 2023 17:02:22 +0200
+Subject: [PATCH] targets: drop TP-Link RE450 and RE355
+
+The flash size is not sufficient to host the minimal set of FFMuc packages
+---
+ targets/ath79-generic | 17 -----------------
+ 1 file changed, 17 deletions(-)
+
+diff --git a/targets/ath79-generic b/targets/ath79-generic
+index 7a5140c9..32a03ce3 100644
+--- a/targets/ath79-generic
++++ b/targets/ath79-generic
+@@ -474,23 +474,6 @@ device('tp-link-eap225-outdoor-v1', 'tplink_eap225-outdoor-v1', {
+ 	packages = ATH10K_PACKAGES_QCA9888,
+ })
+ 
+-device('tp-link-re355-v1', 'tplink_re355-v1', {
+-	manifest_aliases = {
+-		'tp-link-re355', -- upgrade from OpenWrt 19.07
+-	},
+-	packages = ATH10K_PACKAGES_SMALLBUFFERS_QCA9880,
+-	broken = true, -- OOM with 5GHz enabled in most environments if device is 64M RAM variant
+-	class = 'tiny', -- Only 6M of usable Firmware space
+-})
+-
+-device('tp-link-re450-v1', 'tplink_re450-v1', {
+-	packages = ATH10K_PACKAGES_QCA9880,
+-	manifest_aliases = {
+-		'tp-link-re450', -- upgrade from OpenWrt 19.07
+-	},
+-	class = 'tiny', -- Only 6M of usable Firmware space
+-})
+-
+ device('tp-link-tl-wdr3500-v1', 'tplink_tl-wdr3500-v1')
+ device('tp-link-tl-wdr3600-v1', 'tplink_tl-wdr3600-v1')
+ device('tp-link-tl-wdr4300-v1', 'tplink_tl-wdr4300-v1')
+-- 
+2.25.1
+

patches/targets-raspberry-pi-4.patch

@@ -0,0 +1,26 @@
+diff --git a/targets/bcm27xx-bcm2711 b/targets/bcm27xx-bcm2711
+new file mode 100644
+index 00000000..ba631911
+--- /dev/null
++++ b/targets/bcm27xx-bcm2711
+@@ -0,0 +1,9 @@
++include 'bcm27xx.inc'
++
++device('raspberry-pi-4-model-b', 'rpi-4', {
++	manifest_aliases = {
++		'raspberry-pi-4-model-b-rev-1.1',
++		'raspberry-pi-4-model-b-rev-1.2',
++		'raspberry-pi-4-model-b-rev-1.4',
++	},
++})
+diff --git a/targets/targets.mk b/targets/targets.mk
+index d5f605aa..d27865b0 100644
+--- a/targets/targets.mk
++++ b/targets/targets.mk
+@@ -25,5 +25,6 @@ $(eval $(call GluonTarget,x86,64))
+ 
+ ifeq ($(BROKEN),1)
+ $(eval $(call GluonTarget,bcm27xx,bcm2710)) # BROKEN: Untested
++$(eval $(call GluonTarget,bcm27xx,bcm2711)) # BROKEN: Untested
+ $(eval $(call GluonTarget,mvebu,cortexa9)) # BROKEN: No 11s support
+ endif

scripts/apply_patches.sh

@@ -0,0 +1,50 @@
+#!/usr/bin/env bash
+
+set -eEu
+set -o pipefail
+shopt -s nullglob
+
+gluon_build_dir=${1:-gluon-build}
+gluon_patch_dir="${2:-patches}"
+
+function reset_gluon_build_dir() {
+    # Make sure we are in the correct folder
+    if [[ ! $(pwd) =~ .*${gluon_build_dir} ]]; then
+        echo "Resetting environment in the wrong folder. Aborting."
+        return 1
+    fi
+    echo "Resetting environment."
+
+    # Reset all files known to git, but keep manually commited changes.
+    git checkout .
+    # Delete all files not known to git
+    git clean -dx --force
+    echo "Environment reset."
+}
+
+# Relative patches folder does not work with git-apply below. Make sure it is an absolute path.
+if [[ ! ${gluon_patch_dir} =~ ^/ ]]; then
+    gluon_patch_dir="${PWD}/${gluon_patch_dir}"
+    echo "Setting patch directory to ${gluon_patch_dir}"
+fi
+
+pushd "${gluon_build_dir}"
+
+# Check if there are any patches at all
+if ! compgen -G "${gluon_patch_dir}/*.patch" >/dev/null; then
+    echo "No patches found in ${gluon_patch_dir}/*.patch"
+    exit 1
+fi
+
+# Reset previously applied patches
+reset_gluon_build_dir
+
+# Apply all patches
+echo "Applying Patches."
+if ! git apply --ignore-space-change --ignore-whitespace --whitespace=nowarn --verbose "${gluon_patch_dir}"/*.patch; then
+    echo "Patching failed. Inspect ${gluon_build_dir} folder for failed patches."
+    exit 1
+fi
+
+echo "Patching finished."
+popd

scripts/install_build_dependencies.sh

@@ -0,0 +1,40 @@
+#!/usr/bin/env sh
+
+set -eux
+
+# Verify that the script is running in Ubuntu
+. /etc/lsb-release
+if [ "$DISTRIB_ID" != "Ubuntu" ]; then
+    echo "Error: This script only works in Ubuntu"
+    exit 1
+fi
+
+# Avoid tzdata from asking which timezone to choose
+export DEBIAN_FRONTEND=noninteractive
+
+apt-get update
+
+# ca-certificates required for Github git cloning
+apt-get -y --no-install-recommends install ca-certificates
+
+# Install build environment
+apt-get -y --no-install-recommends install \
+    bash \
+    bzip2 \
+    curl \
+    diffutils \
+    file \
+    g++ \
+    gawk \
+    gcc \
+    git \
+    libncurses5-dev \
+    make \
+    patch \
+    perl \
+    python3 \
+    qemu-utils \
+    rsync \
+    tar \
+    unzip \
+    wget

site.conf

@@ -2,28 +2,17 @@
   hostname_prefix = '',
   site_name = 'Freifunk Regensburg',
   site_code = 'ffrgb',
-  default_domain = 'ffrgb',
+  default_domain = 'ffrgb_cty',
 
   opkg = {
-    --[[ old
-    openwrt = 'http://downloads.openwrt.org/%n/%v/%S/packages',
-    ]]
-    lede = 'http://downloads.lede-project.org/snapshots/packages/%A',
+    openwrt = 'http://downloads.openwrt.org/snapshots/packages/%A',
   },
 
   timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
-  ntp_servers = {'1.ntp.services.ffrgb','2.ntp.services.ffrgb'},
-
-  mesh_on_wan = false,
+  ntp_servers = {'ntp.ffrgb.net'},
 
   regdom = 'DE',
 
-  wifi24 = {
-    -- disable 802.11b support:
-    supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000}, -- List of supported wifi rates (optional)
-    basic_rate = {6000, 9000, 18000, 36000, 54000}, -- List of basic wifi rates (optional, required if supported_rates is set)
-  },
-
   mesh_vpn = {
     mtu = 1426,
     fastd = {
@@ -61,5 +50,33 @@
       },
     },
   },
+
+  config_mode = {
+    geo_location = {
+      show_altitude = false,
+      osm = {
+        center = {
+          lat = 49.01384173771134, 
+          lon = 12.096109539536478,
+        },
+        zoom = 12,
+      },
+    },
+  },
+
+  interfaces = {
+    lan = {
+      default_roles = { 'client' },
+    },
+    wan = {
+      default_roles = { 'uplink', 'mesh' },
+    },
+    single = {
+      default_roles = { 'uplink', 'mesh' },
+    },
+  },
+
 }
+
+
 -- vim: set ft=lua:ts=2:sw=2:et

site.mk

@@ -1,44 +1,195 @@
+GLUON_MULTIDOMAIN=1
+GLUON_DEPRECATED ?= upgrade
+
+GLUON_FEATURES := \
+	autoupdater \
+	config-mode-domain-select \
+	config-mode-geo-location-osm \
+	config-mode-mesh-vpn \
+	ebtables-filter-multicast \
+	ebtables-filter-ra-dhcp \
+	ebtables-source-filter \
+	mesh-batman-adv-15 \
+	respondd \
+	status-page \
+	web-advanced \
+	web-private-wifi \
+	web-wizard
+
+
+# base packages
 GLUON_SITE_PACKAGES := \
-	gluon-mesh-batman-adv-15 \
-	gluon-respondd \
-	gluon-autoupdater \
-	gluon-config-mode-core \
-	gluon-config-mode-autoupdater \
-	gluon-config-mode-hostname \
-	gluon-config-mode-mesh-vpn \
-	gluon-config-mode-domain-select \
-	gluon-config-mode-geo-location \
-	gluon-config-mode-contact-info \
-	gluon-ebtables-filter-multicast \
-	gluon-ebtables-filter-ra-dhcp \
-	gluon-ebtables-source-filter \
-	gluon-web-admin \
-	gluon-web-autoupdater \
-	gluon-web-network \
-	gluon-web-wifi-config \
-	gluon-web-mesh-vpn-fastd \
-	gluon-web-private-wifi \
-	gluon-mesh-vpn-fastd \
-	gluon-radvd \
-	gluon-setup-mode \
-	gluon-status-page \
 	gluon-segment-mover \
 	iwinfo \
-	iptables \
-	haveged \
 	gluon-ssid-changer \
 	respondd-module-airtime \
-	ffrgb-banner #\
-	#ffho-site-generate \
-	#ffho-config-mode-site-select \
+	gluon-mesh-vpn-wireguard-vxlan \
+	ffrgb-banner 
+
+DEFAULT_GLUON_RELEASE := snapshot~$(shell date '+%Y%m%d')
+# Allow overriding the release number from the command line
+GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
+GLUON_PRIORITY ?= 0
+GLUON_REGION ?= eu
+GLUON_LANGS ?= en de
+
+# additional packages
+
+INCLUDE_USB := \
+    usbutils
+
+EXCLUDE_USB := \
+    -usbutils
+
+INCLUDE_USB_HID := \
+    kmod-usb-hid \
+    kmod-hid-generic
+
+EXCLUDE_USB_HID := \
+    -kmod-usb-hid \
+    -kmod-hid-generic
+
+INCLUDE_USB_SERIAL := \
+    kmod-usb-serial \
+    kmod-usb-serial-ftdi \
+    kmod-usb-serial-pl2303
+
+EXCLUDE_USB_SERIAL := \
+    -kmod-usb-serial \
+    -kmod-usb-serial-ftdi \
+    -kmod-usb-serial-pl2303
+
+INCLUDE_USB_STORAGE := \
+    block-mount \
+    blkid \
+    kmod-fs-ext4 \
+    kmod-fs-ntfs \
+    kmod-fs-vfat \
+    kmod-usb-storage \
+    kmod-usb-storage-extras \
+    kmod-usb-storage-uas \
+    kmod-nls-base \
+    kmod-nls-cp1250 \
+    kmod-nls-cp437 \
+    kmod-nls-cp850 \
+    kmod-nls-cp852 \
+    kmod-nls-iso8859-1 \
+    kmod-nls-iso8859-13 \
+    kmod-nls-iso8859-15 \
+    kmod-nls-iso8859-2 \
+    kmod-nls-utf8
+
+EXCLUDE_USB_STORAGE := \
+    -block-mount \
+    -blkid \
+    -kmod-fs-ext4 \
+    -kmod-fs-ntfs \
+    -kmod-fs-vfat \
+    -kmod-usb-storage \
+    -kmod-usb-storage-extras \
+    -kmod-usb-storage-uas \
+    -kmod-nls-base \
+    -kmod-nls-cp1250 \
+    -kmod-nls-cp437 \
+    -kmod-nls-cp850 \
+    -kmod-nls-cp852 \
+    -kmod-nls-iso8859-1 \
+    -kmod-nls-iso8859-13 \
+    -kmod-nls-iso8859-15 \
+    -kmod-nls-iso8859-2 \
+    -kmod-nls-utf8
+
+INCLUDE_USB_NET := \
+    kmod-mii \
+    kmod-usb-net \
+    kmod-usb-net-asix \
+    kmod-usb-net-asix-ax88179 \
+    kmod-usb-net-cdc-eem \
+    kmod-usb-net-cdc-ether \
+    kmod-usb-net-cdc-subset \
+    kmod-usb-net-dm9601-ether \
+    kmod-usb-net-hso \
+    kmod-usb-net-ipheth \
+    kmod-usb-net-mcs7830 \
+    kmod-usb-net-pegasus \
+    kmod-usb-net-rndis \
+    kmod-usb-net-rtl8152 \
+    kmod-usb-net-smsc95xx
+
+EXCLUDE_USB_NET := \
+    -kmod-mii \
+    -kmod-usb-net \
+    -kmod-usb-net-asix \
+    -kmod-usb-net-asix-ax88179 \
+    -kmod-usb-net-cdc-eem \
+    -kmod-usb-net-cdc-ether \
+    -kmod-usb-net-cdc-subset \
+    -kmod-usb-net-dm9601-ether \
+    -kmod-usb-net-hso \
+    -kmod-usb-net-ipheth \
+    -kmod-usb-net-mcs7830 \
+    -kmod-usb-net-pegasus \
+    -kmod-usb-net-rndis \
+    -kmod-usb-net-rtl8152 \
+    -kmod-usb-net-smsc95xx
+
+INCLUDE_PCI := \
+    pciutils
+
+EXCLUDE_PCI := \
+    -pciutils
+
+INCLUDE_PCI_NET := \
+    kmod-bnx2
+
+EXCLUDE_PCI_NET := \
+    -kmod-bnx2
+
+INCLUDE_TLS := \
+    ca-bundle \
+    libustream-openssl
+
+EXCLUDE_TLS := \
+    -ca-bundle \
+    -libustream-openssl
+
+ifeq ($(GLUON_TARGET),ath79-generic)
+    GLUON_SITE_PACKAGES += $(INCLUDE_TLS)
+    GLUON_devolo-wifi-pro-1750e_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
+    GLUON_gl.inet-gl-ar150_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
+    GLUON_gl.inet-gl-ar300m-lite_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
+    GLUON_gl.inet-gl-ar750_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
+    GLUON_joy-it-jt-or750i_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
+    GLUON_netgear-wndr3700-v2_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
+    GLUON_tp-link-archer-a7-v5_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
+    GLUON_tp-link-archer-c5-v1_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
+    GLUON_tp-link-archer-c7-v2_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
+    GLUON_tp-link-archer-c7-v5_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
+    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_d-link-dir825b1_SITE_PACKAGES += $(EXCLUDE_TLS)
+    GLUON_tp-link-re355-v1_SITE_PACKAGES += $(EXCLUDE_TLS)
+    GLUON_tp-link-re450-v1_SITE_PACKAGES += $(EXCLUDE_USB) $(EXCLUDE_USB_NET) $(EXCLUDE_USB_SERIAL) $(EXCLUDE_USB_STORAGE)
+endif
+
+# no pkglists for target ath79-mikrotik
 
 
-# basic support for USB stack
+ifeq ($(GLUON_TARGET),ath79-nand)
+    GLUON_SITE_PACKAGES += $(INCLUDE_TLS) $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
+endif
+
+ifeq ($(GLUON_TARGET),bcm27xx-bcm2708)
+    GLUON_SITE_PACKAGES += $(INCLUDE_TLS) $(INCLUDE_USB) $(INCLUDE_USB_HID) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
+endif
+
+# some extra sauce to make offloader/kvm images extra spicy
+
 USB_PACKAGES_BASIC := \
 	kmod-usb-core \
 	kmod-usb2
 
-# storage support for USB devices
 USB_PACKAGES_STORAGE := \
 	block-mount \
 	blkid \
@@ -86,9 +237,7 @@ USB_PACKAGES_NET := \
 	kmod-usb-net-rtl8152 \
 	kmod-usb-net-sierrawireless \
 	kmod-usb-net-smsc95xx
-# broken
-#	kmod-usb-net-rtl8150 \
-# additional USB network devices (ie Edimax)
+
 USB_PACKAGES_NET_ADD := \
 	kmod-rtl8192cu \
 	kmod-rtl8187 \
@@ -99,7 +248,6 @@ USB_PACKAGES_NET_ADD := \
 	kmod-carl9170 \
 	kmod-brcmfmac
 
-# network support for PCI devices
 PCI_PACKAGES_NET := \
 	kmod-3c59x \
 	kmod-e100 \
@@ -115,22 +263,13 @@ PCI_PACKAGES_NET := \
 	kmod-tg3 \
 	kmod-tulip \
 	kmod-via-rhine
-# broken
-#	kmod-ixgbe \
-#	kmod-r8139too \
-# additional packages
+
 TOOLS_PACKAGES := \
 	iperf \
 	socat \
 	tcpdump \
 	usbutils \
 	vnstat
-# broken
-#	pciutils \
-
-#
-# $(GLUON_TARGET) specific settings:
-#
 
 # x86-generic
 ifeq ($(GLUON_TARGET),x86-generic)
@@ -163,55 +302,3 @@ GLUON_SITE_PACKAGES += \
 	$(TOOLS_PACKAGES) \
 	$(USB_PACKAGES_NET_ADD)
 endif
-
-# Raspberry Pi A/B/B+
-ifeq ($(GLUON_TARGET),brcm2708-bcm2708)
-GLUON_SITE_PACKAGES += \
-	kmod-usb-hid \
-	kmod-hid-generic \
-	$(USB_PACKAGES_BASIC) \
-	$(USB_PACKAGES_STORAGE) \
-	$(USB_PACKAGES_NET) \
-	$(TOOLS_PACKAGES) \
-	$(USB_PACKAGES_NET_ADD)
-endif
-
-# Raspberry Pi 2
-ifeq ($(GLUON_TARGET),brcm2708-bcm2709)
-GLUON_SITE_PACKAGES += \
-	kmod-usb-hid \
-	kmod-hid-generic \
-	$(USB_PACKAGES_BASIC) \
-	$(USB_PACKAGES_STORAGE) \
-	$(USB_PACKAGES_NET) \
-	$(TOOLS_PACKAGES) \
-	$(USB_PACKAGES_NET_ADD)
-endif
-
-# ar71xx-generic
-GLUON_TLWR842_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
-GLUON_TLWR1043_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
-GLUON_TLWR2543_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
-GLUON_TLWDR4300_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
-GLUON_WNDR3700_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
-GLUON_WRT160NL_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
-GLUON_ARCHERC7_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
-GLUON_GLINET_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
-GLUON_WZRHPG450H_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
-GLUON_WZRHPAG300H_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
-
-# mpc85xx-generic
-GLUON_TLWDR4900_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
-
-
-DEFAULT_GLUON_RELEASE := snapshot~$(shell date '+%Y%m%d')
-
-# Allow overriding the release number from the command line
-GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
-
-GLUON_PRIORITY ?= 0
-
-# Languages to include
-GLUON_LANGS ?= en de
-GLUON_WLAN_MESH := ibss
-GLUON_MULTIDOMAIN=1

targets

@@ -0,0 +1,25 @@
+ath79-generic
+ath79-mikrotik
+ath79-nand
+bcm27xx-bcm2708
+bcm27xx-bcm2709
+bcm27xx-bcm2710
+bcm27xx-bcm2711
+ipq40xx-generic
+ipq40xx-mikrotik
+ipq806x-generic
+lantiq-xrx200
+lantiq-xway
+mediatek-mt7622
+mpc85xx-p1010
+mpc85xx-p1020
+mvebu-cortexa9
+ramips-mt7620
+ramips-mt7621
+ramips-mt76x8
+rockchip-armv8
+sunxi-cortexa7
+x86-64
+x86-generic
+x86-geode
+x86-legacy