From 156b6714f43e2474549e80796d57b8d6260845b1 Mon Sep 17 00:00:00 2001 From: Bastian Date: Fri, 6 Dec 2019 23:19:53 +0000 Subject: [PATCH 01/10] Update to Gluon v2019.1 --- Makefile | 2 +- site.mk | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8f5af04..036a236 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon -GLUON_GIT_REF := v2018.1 +GLUON_GIT_REF := v2019.1 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key diff --git a/site.mk b/site.mk index 7ca10a4..d12da09 100644 --- a/site.mk +++ b/site.mk @@ -209,6 +209,8 @@ DEFAULT_GLUON_RELEASE := snapshot~$(shell date '+%Y%m%d') # Allow overriding the release number from the command line GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE) +GLUON_DEPRECATED ?= 1 + GLUON_PRIORITY ?= 0 # Languages to include From 8a80a9e8d494ea6037b77d5b725b84d290bb787e Mon Sep 17 00:00:00 2001 From: Bastian Date: Sat, 7 Dec 2019 12:02:47 +0000 Subject: [PATCH 02/10] Removed LEDE repos, revert to old OpenWRT scheme --- domains/ffrgb.conf | 5 +---- domains/ffrgb_cty.conf | 7 ------- domains/ffrgb_tst.conf | 7 ------- domains/ffrgb_uml.conf | 7 ------- 4 files changed, 1 insertion(+), 25 deletions(-) diff --git a/domains/ffrgb.conf b/domains/ffrgb.conf index be7c5d8..62209b0 100644 --- a/domains/ffrgb.conf +++ b/domains/ffrgb.conf @@ -4,10 +4,7 @@ hide_domain = true, 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', }, prefix4 = '10.90.0.0/19', diff --git a/domains/ffrgb_cty.conf b/domains/ffrgb_cty.conf index 5cdea53..7a442d7 100644 --- a/domains/ffrgb_cty.conf +++ b/domains/ffrgb_cty.conf @@ -2,13 +2,6 @@ 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'}, diff --git a/domains/ffrgb_tst.conf b/domains/ffrgb_tst.conf index c4570a2..02ac1e5 100644 --- a/domains/ffrgb_tst.conf +++ b/domains/ffrgb_tst.conf @@ -3,13 +3,6 @@ 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'}, diff --git a/domains/ffrgb_uml.conf b/domains/ffrgb_uml.conf index 3d8d911..f84991f 100644 --- a/domains/ffrgb_uml.conf +++ b/domains/ffrgb_uml.conf @@ -2,13 +2,6 @@ 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'}, From f0ce2d64f53f9776696eec73d7c7df8ff6b07766 Mon Sep 17 00:00:00 2001 From: Bastian Date: Sun, 8 Dec 2019 00:15:48 +0000 Subject: [PATCH 03/10] Remove Legacy Config completely --- domains/ffrgb.conf | 106 --------------------------------------------- 1 file changed, 106 deletions(-) delete mode 100644 domains/ffrgb.conf diff --git a/domains/ffrgb.conf b/domains/ffrgb.conf deleted file mode 100644 index 62209b0..0000000 --- a/domains/ffrgb.conf +++ /dev/null @@ -1,106 +0,0 @@ -{ - domain_names = { ffrgb = 'Legacy' }, - domain_seed = 'c8951e3a104d55543da98ee732468ea121878e77c6d18cbcbefb5409c292601a', - hide_domain = true, - - opkg = { - openwrt = 'http://downloads.openwrt.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 From 8bed703d18c32a7355e29a3669d7ded644c477c8 Mon Sep 17 00:00:00 2001 From: Bastian Date: Sun, 8 Dec 2019 00:17:02 +0000 Subject: [PATCH 04/10] Change default domain, remove obsolete 802.11b bands --- site.conf | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/site.conf b/site.conf index 0b09821..d5de36a 100644 --- a/site.conf +++ b/site.conf @@ -2,13 +2,10 @@ 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', @@ -18,12 +15,6 @@ 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 = { From 02f53fe0c4865fc53a6f27dfd17a92ba878d8922 Mon Sep 17 00:00:00 2001 From: Bastian Date: Sun, 8 Dec 2019 00:17:54 +0000 Subject: [PATCH 05/10] Remove reduundant x86 target, remove obsolete sunxi --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 036a236..df3d8d8 100644 --- a/Makefile +++ b/Makefile @@ -4,9 +4,9 @@ GLUON_GIT_REF := v2019.1 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key + GLUON_TARGETS ?= \ ar71xx-generic \ - x86-64 \ ar71xx-tiny \ ar71xx-nand \ brcm2708-bcm2708 \ @@ -17,7 +17,6 @@ GLUON_TARGETS ?= \ x86-64 \ x86-generic \ x86-geode \ - sunxi GLUON_RELEASE := $(shell git describe --tags 2>/dev/null) @@ -31,7 +30,7 @@ JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l) #JOBS = 1 -GLUON_MAKE := ${MAKE} BROKEN=0 -j ${JOBS} -C ${GLUON_BUILD_DIR} \ +GLUON_MAKE := ${MAKE} V=s BROKEN=0 -j ${JOBS} -C ${GLUON_BUILD_DIR} \ GLUON_RELEASE=${GLUON_RELEASE} \ GLUON_BRANCH=${GLUON_BRANCH} \ From 43cb0f8a40f8c7680c0dcc740720f101c8aea28d Mon Sep 17 00:00:00 2001 From: Bastian Date: Sun, 8 Dec 2019 00:18:36 +0000 Subject: [PATCH 06/10] Add 11s mesh ssids, add routingalgo info --- domains/ffrgb_cty.conf | 9 ++++++++- domains/ffrgb_tst.conf | 9 ++++++++- domains/ffrgb_uml.conf | 9 ++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/domains/ffrgb_cty.conf b/domains/ffrgb_cty.conf index 7a442d7..ad31200 100644 --- a/domains/ffrgb_cty.conf +++ b/domains/ffrgb_cty.conf @@ -19,6 +19,9 @@ bssid = '02:0E:8E:1E:61:01', mcast_rate = 12000, }, + mesh = { + id = 'loo23eWueg11s', + }, }, wifi5 = { @@ -31,7 +34,10 @@ ssid = 'mesh.ffrgb_cty', bssid = '02:0E:8E:1E:61:01', mcast_rate = 12000, - } + }, + mesh = { + id = 'loo23eWueg11s', + }, }, dns = { @@ -51,6 +57,7 @@ filter_membership_reports = false, batman_adv = { gw_sel_class = 1, + routing_algo = 'BATMAN_IV', }, }, diff --git a/domains/ffrgb_tst.conf b/domains/ffrgb_tst.conf index 02ac1e5..b83f5b0 100644 --- a/domains/ffrgb_tst.conf +++ b/domains/ffrgb_tst.conf @@ -20,6 +20,9 @@ bssid = '02:0E:8E:1E:61:03', mcast_rate = 12000, }, + mesh = { + id = 'mesh_ffrgb_tst_11s', + }, }, wifi5 = { @@ -32,7 +35,10 @@ ssid = 'mesh.ffrgb_test', bssid = '02:0E:8E:1E:61:03', mcast_rate = 12000, - } + }, + mesh = { + id = 'mesh_ffrgb_tst_11s', + }, }, dns = { @@ -52,6 +58,7 @@ filter_membership_reports = false, batman_adv = { gw_sel_class = 1, + routing_algo = 'BATMAN_IV', }, }, diff --git a/domains/ffrgb_uml.conf b/domains/ffrgb_uml.conf index f84991f..da6140b 100644 --- a/domains/ffrgb_uml.conf +++ b/domains/ffrgb_uml.conf @@ -19,6 +19,9 @@ bssid = '02:0E:8E:1E:61:02', mcast_rate = 12000, }, + mesh = { + id = 'Ishei42esh11s', + }, }, wifi5 = { @@ -31,7 +34,10 @@ ssid = 'mesh.ffrgb_uml', bssid = '02:0E:8E:1E:61:02', mcast_rate = 12000, - } + }, + mesh = { + id = 'Ishei42esh11s', + }, }, dns = { @@ -51,6 +57,7 @@ filter_membership_reports = false, batman_adv = { gw_sel_class = 1, + routing_algo = 'BATMAN_IV', }, }, From 8e6a0e5b79f25fa8f476a998c4917f3f823c85af Mon Sep 17 00:00:00 2001 From: Bastian Date: Fri, 29 May 2020 13:17:39 +0000 Subject: [PATCH 07/10] Update to gluon-2019.1.2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index df3d8d8..1697dbd 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon -GLUON_GIT_REF := v2019.1 +GLUON_GIT_REF := v2019.1.2 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From 800a990fc80eb88c3f9a8f45c09557b6a3809563 Mon Sep 17 00:00:00 2001 From: Bastian Date: Fri, 29 May 2020 13:40:16 +0000 Subject: [PATCH 08/10] Pull future firmwares from another directory --- domains/ffrgb_cty.conf | 4 ++-- domains/ffrgb_tst.conf | 4 ++-- domains/ffrgb_uml.conf | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/domains/ffrgb_cty.conf b/domains/ffrgb_cty.conf index ad31200..92e0196 100644 --- a/domains/ffrgb_cty.conf +++ b/domains/ffrgb_cty.conf @@ -107,12 +107,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/', }, }, }, diff --git a/domains/ffrgb_tst.conf b/domains/ffrgb_tst.conf index b83f5b0..0a8fcfd 100644 --- a/domains/ffrgb_tst.conf +++ b/domains/ffrgb_tst.conf @@ -108,12 +108,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/', }, }, }, diff --git a/domains/ffrgb_uml.conf b/domains/ffrgb_uml.conf index da6140b..f9aa3c8 100644 --- a/domains/ffrgb_uml.conf +++ b/domains/ffrgb_uml.conf @@ -107,12 +107,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/', }, }, }, From aa55a6853da601505558e815f0e65373e7f4a31e Mon Sep 17 00:00:00 2001 From: Bastian Date: Fri, 29 May 2020 14:59:54 +0000 Subject: [PATCH 09/10] Bump to 2020.1.2, remove ibbs completely --- Makefile | 2 +- domains/ffrgb_cty.conf | 10 ---------- domains/ffrgb_tst.conf | 10 ---------- domains/ffrgb_uml.conf | 10 ---------- site.mk | 2 +- 5 files changed, 2 insertions(+), 32 deletions(-) diff --git a/Makefile b/Makefile index 1697dbd..2d63f37 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon -GLUON_GIT_REF := v2019.1.2 +GLUON_GIT_REF := v2020.1.2 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key diff --git a/domains/ffrgb_cty.conf b/domains/ffrgb_cty.conf index 92e0196..c93410b 100644 --- a/domains/ffrgb_cty.conf +++ b/domains/ffrgb_cty.conf @@ -14,11 +14,6 @@ ap = { ssid = 'regensburg.freifunk.net', }, - ibss = { - ssid = 'mesh.ffrgb_cty', - bssid = '02:0E:8E:1E:61:01', - mcast_rate = 12000, - }, mesh = { id = 'loo23eWueg11s', }, @@ -30,11 +25,6 @@ ap = { ssid = 'regensburg.freifunk.net', }, - ibss = { - ssid = 'mesh.ffrgb_cty', - bssid = '02:0E:8E:1E:61:01', - mcast_rate = 12000, - }, mesh = { id = 'loo23eWueg11s', }, diff --git a/domains/ffrgb_tst.conf b/domains/ffrgb_tst.conf index 0a8fcfd..09de27a 100644 --- a/domains/ffrgb_tst.conf +++ b/domains/ffrgb_tst.conf @@ -15,11 +15,6 @@ 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', }, @@ -31,11 +26,6 @@ ap = { ssid = 'test.freifunk.net', }, - ibss = { - ssid = 'mesh.ffrgb_test', - bssid = '02:0E:8E:1E:61:03', - mcast_rate = 12000, - }, mesh = { id = 'mesh_ffrgb_tst_11s', }, diff --git a/domains/ffrgb_uml.conf b/domains/ffrgb_uml.conf index f9aa3c8..86a8685 100644 --- a/domains/ffrgb_uml.conf +++ b/domains/ffrgb_uml.conf @@ -14,11 +14,6 @@ ap = { ssid = 'land.regensburg.freifunk.net', }, - ibss = { - ssid = 'mesh.ffrgb_uml', - bssid = '02:0E:8E:1E:61:02', - mcast_rate = 12000, - }, mesh = { id = 'Ishei42esh11s', }, @@ -30,11 +25,6 @@ ap = { ssid = 'regensburg.freifunk.net', }, - ibss = { - ssid = 'mesh.ffrgb_uml', - bssid = '02:0E:8E:1E:61:02', - mcast_rate = 12000, - }, mesh = { id = 'Ishei42esh11s', }, diff --git a/site.mk b/site.mk index d12da09..2fea469 100644 --- a/site.mk +++ b/site.mk @@ -215,5 +215,5 @@ GLUON_PRIORITY ?= 0 # Languages to include GLUON_LANGS ?= en de -GLUON_WLAN_MESH := ibss +GLUON_WLAN_MESH := 11s GLUON_MULTIDOMAIN=1 From 6a80057391ba0655366a98e689968abff667eefe Mon Sep 17 00:00:00 2001 From: Bastian Date: Fri, 29 May 2020 20:19:03 +0000 Subject: [PATCH 10/10] Add support for bunch of devices.. --- Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Makefile b/Makefile index 2d63f37..854f065 100644 --- a/Makefile +++ b/Makefile @@ -9,11 +9,20 @@ GLUON_TARGETS ?= \ ar71xx-generic \ ar71xx-tiny \ ar71xx-nand \ + ath79-generic \ brcm2708-bcm2708 \ brcm2708-bcm2709 \ + ipq806x-generic \ + lantiq-xrx200 \ + lantiq-xway \ mpc85xx-generic \ + mpc85xx-p1020 \ + ramips-mt7620 \ ramips-mt7621 \ + ramips-mt76x8 \ ramips-rt305x \ + ipq40xx-generic \ + sunxi-cortexa7 \ x86-64 \ x86-generic \ x86-geode \