Merge pull request #26 from ffrgb/v2023.1.x

V2023.1.x

.gitignore

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

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Freifunk Regensburg Firmware Changelog
 
+## v2018.1.2-2 experimental
+ - Switch to domain-select features from Upstream Gluon
+
+## v2016.1-12 experimental
+ - Update to Gluon 2016.1.5
+
+## v2016.1
+ - Update to Gluon v2015.1.4
+ - Many new devices
+ - switched from announced to respondd
+ - changed naming: no more sitecode in version, Schwandorf dropped
+
 ## v2015.1-ffrgb
  - Update to Gluon v2015.1
  - Integrated no_rebroadcast fix on mesh-vpn from Gluon Upstream

Makefile

@@ -1,28 +1,30 @@
 GLUON_BUILD_DIR := gluon-build
-GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
-GLUON_GIT_REF := v2015.1
+GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon
+GLUON_GIT_REF := 4e2bd01d5f7ee1677d522e75c3818719e513eb01
+
+PATCH_DIR := ./patches
 
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
 
-GLUON_TARGETS ?= \
-	ar71xx-generic \
-	ar71xx-nand \
-	x86-kvm_guest
+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} -j ${JOBS} -C ${GLUON_BUILD_DIR} \
-			GLUON_RELEASE=${GLUON_RELEASE} \
-			GLUON_BRANCH=${GLUON_BRANCH}
+	GLUON_RELEASE=${GLUON_RELEASE} \
+	GLUON_AUTOUPDATER_BRANCH=${GLUON_AUTOUPDATER_BRANCH} \
+	GLUON_AUTOUPDATER_ENABLED=${GLUON_AUTOUPDATER_ENABLED}
+
 
 all: info
 	${MAKE} manifest
@@ -30,35 +32,52 @@ all: info
 info:
 	@echo
 	@echo '#########################'
-	@echo '# FFRGB Firmare build'
-	@echo '# Building release ${GLUON_RELEASE} for branch ${GLUON_BRANCH}'
+	@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
 
 manifest: build
-	${GLUON_MAKE} manifest
-	mv ${GLUON_BUILD_DIR}/images .
+	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 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,12 +1,28 @@
 ## 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/v2014.3.1/user/site.html)
+Look at the [site configuration related Gluon documentation](http://gluon.readthedocs.org/en/v2016.2.3/user/site.html)
 for information on site configuration options and examples from other communities.

domains/ffrgb_cty.conf

@@ -0,0 +1,116 @@
+{
+  domain_names = { ffrgb_cty = 'Regensburg Stadt' },
+  domain_seed = '1124de9b0fe2dde424c8a4c481816b5899e6d1b4b4cf72de42136c4f1f197c7a',
+
+  prefix4 = '10.90.32.0/19',
+  prefix6 = 'fdef:f10f:1337:cafe::/64',
+  extra_prefixes6 = {'2a00:9d80:6000:0101::/64', '2001:678:ddc:11::/64', '2001:678:e64:12::/64'},
+
+  wifi24 = {
+    channel = 1,
+    htmode = 'HT20',
+    ap = {
+      ssid = 'regensburg.freifunk.net',
+    },
+    mesh = {
+      id = 'loo23eWueg11s',
+    },
+  },
+
+  wifi5 = {
+    channel = 44,
+    htmode = 'HT20',
+    ap = {
+      ssid = 'regensburg.freifunk.net',
+    },
+    mesh = {
+      id = 'loo23eWueg11s',
+    },
+  },
+
+  dns = {
+    cacheentries = 500,
+    servers = { 'fdef:f10f:1337:cafe::11', 'fdef:f10f:1337:cafe::12', },
+  },
+
+  next_node = {
+    name = { 'nextnode.ffrgb', 'nextnode', 'nn' },
+    ip4 = '10.90.32.1',
+    ip6 = 'fdef:f10f:1337:cafe::1',
+    mac = '16:41:95:40:f7:01',
+  },
+
+  mesh = {
+    vxlan = true,
+    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 = {
+          limit = 1,
+          peers = {
+            gwpri = {   --[[ primary ]]
+              key = '86a4dcdbaba87fe30da03cc398a083d7a0725c44dac733b583515b188fdc63dd',
+              remotes = {
+                '"gw11.ffrgb.net" port 10010',
+                '"gw11.ffrgb.net" port 10011',
+                '"gw11.ffrgb.net" port 10012',
+                '"gw11.regensburg.freifunk.net" port 10010',
+                '"gw11.regensburg.freifunk.net" port 10011',
+                '"gw11.regensburg.freifunk.net" port 10012',
+              },
+            },
+            gwsec = {   --[[ coldstandby ]]
+              key = '0000000000000000000000000000000000000000000000000000000000000000',
+              remotes = {
+                '"gw12.ffrgb.net" port 10010',
+                '"gw12.ffrgb.net" port 10012',
+                '"gw12.ffrgb.net" port 10011',
+                '"gw12.regensburg.freifunk.net" port 10010',
+                '"gw12.regensburg.freifunk.net" port 10011',
+                '"gw12.regensburg.freifunk.net" port 10012',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+
+  autoupdater = {
+    enabled = 1,
+    branches = {
+      stable = {
+        mirrors = {
+          'http://fw.services.ffrgb/firmware-11s/stable/sysupgrade/',
+        },
+      },
+      experimental = {
+        mirrors = {
+          'http://fw.services.ffrgb/firmware-11s/experimental/sysupgrade/',
+        },
+      },
+    },
+  },
+}
+-- vim: set ft=lua:ts=2:sw=2:et

domains/ffrgb_tst.conf

@@ -0,0 +1,117 @@
+{
+  domain_names = { ffrgb_tst = 'Regensburg Testumgebung' },
+  domain_seed = 'bcd0ceca2c68b5b9a5975156a0ec0a04aebe3300d9928a04dc57001cc96db252',
+  hide_domain = true,
+
+  prefix4 = '10.90.96.0/19',
+  prefix6 = 'fdef:f30f:1337:cafe::/64',
+  extra_prefixes6 = {'2a00:9d80:6000:0103::/64', '2001:678:ddc:31::/64', '2001:678:e64:32::/64'},
+
+  wifi24 = {
+    channel = 1,
+    htmode = 'HT20',
+    ap = {
+      ssid = 'test.ffrgb.net',
+    },
+    mesh = {
+      id = 'mesh_ffrgb_tst_11s',
+    },
+  },
+
+  wifi5 = {
+    channel = 44,
+    htmode = 'HT20',
+    ap = {
+      ssid = 'test.ffrgb.net',
+    },
+    mesh = {
+      id = 'mesh_ffrgb_tst_11s',
+    },
+  },
+
+  dns = {
+    cacheentries = 500,
+    servers = { 'fdef:f30f:1337:cafe::31', 'fdef:f30f:1337:cafe::32', },
+  },
+
+  next_node = {
+    name = { 'nextnode.ffrgb', 'nextnode', 'nn' },
+    ip4 = '10.90.96.1',
+    ip6 = 'fdef:f30f:1337:cafe::1',
+    mac = '16:41:95:40:f7:03',
+  },
+
+  mesh = {
+    vxlan = true,
+    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 = {
+          limit = 1,
+          peers = {
+            gwpri = {   --[[ primary ]]
+              key = '377e0246271bfbf4c99c2d156ee0eb77c16bb5629841fde507cfab6760162b61',
+              remotes = {
+                '"gw31.ffrgb.net" port 10030',
+                '"gw31.ffrgb.net" port 10031',
+                '"gw31.ffrgb.net" port 10032',
+                '"gw31.regensburg.freifunk.net" port 10030',
+                '"gw31.regensburg.freifunk.net" port 10031',
+                '"gw31.regensburg.freifunk.net" port 10032',
+              },
+            },
+            gwsec = {   --[[ coldstandby ]]
+              key = '0000000000000000000000000000000000000000000000000000000000000000',
+              remotes = {
+                '"gw32.ffrgb.net" port 10030',
+                '"gw32.ffrgb.net" port 10031',
+                '"gw32.ffrgb.net" port 10032',
+                '"gw32.regensburg.freifunk.net" port 10030',
+                '"gw32.regensburg.freifunk.net" port 10031',
+                '"gw32.regensburg.freifunk.net" port 10032',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+
+  autoupdater = {
+    enabled = 0,
+    branches = {
+      stable = {
+        mirrors = {
+          'http://fw.services.ffrgb/firmware-11s/stable/sysupgrade/',
+        },
+      },
+      experimental = {
+        mirrors = {
+          'http://fw.services.ffrgb/firmware-11s/experimental/sysupgrade/',
+        },
+      },
+    },
+  },
+}
+-- vim: set ft=lua:ts=2:sw=2:et

domains/ffrgb_uml.conf

@@ -0,0 +1,116 @@
+{
+  domain_names = { ffrgb_uml = 'Regensburg Umland' },
+  domain_seed = 'f3d54e3dfc4108dd3356664bbab4baef3b2920ad943c27edce4b284a68e776fd',
+
+  prefix4 = '10.90.64.0/19',
+  prefix6 = 'fdef:f20f:1337:cafe::/64',
+  extra_prefixes6 = {'2a00:9d80:6000:0102::/64', '2001:678:ddc:21::/64', '2001:678:e64:22::/64'},
+
+  wifi24 = {
+    channel = 1,
+    htmode = 'HT20',
+    ap = {
+      ssid = 'land.regensburg.freifunk.net',
+    },
+    mesh = {
+      id = 'Ishei42esh11s',
+    },
+  },
+
+  wifi5 = {
+    channel = 44,
+    htmode = 'HT20',
+    ap = {
+      ssid = 'land.regensburg.freifunk.net',
+    },
+    mesh = {
+      id = 'Ishei42esh11s',
+    },
+  },
+
+  dns = {
+    cacheentries = 500,
+    servers = { 'fdef:f20f:1337:cafe::21', 'fdef:f20f:1337:cafe::22', },
+  },
+
+  next_node = {
+    name = { 'nextnode.ffrgb', 'nextnode', 'nn' },
+    ip4 = '10.90.64.1',
+    ip6 = 'fdef:f20f:1337:cafe::1',
+    mac = '16:41:95:40:f7:02',
+  },
+
+  mesh = {
+    vxlan = true,
+    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 = {
+          limit = 1,
+          peers = {
+            gwpri = {   --[[ primary ]]
+              key = '0dd861f1725bb5562f96fec8a906440c1965d1b1f8a88663dea834e523d788ea',
+              remotes = {
+                '"gw21.ffrgb.net" port 10020',
+                '"gw21.ffrgb.net" port 10021',
+                '"gw21.ffrgb.net" port 10022',
+                '"gw21.regensburg.freifunk.net" port 10020',
+                '"gw21.regensburg.freifunk.net" port 10021',
+                '"gw21.regensburg.freifunk.net" port 10022',
+              },
+            },
+            gwsec = {   --[[ coldstandby ]]
+              key = '0000000000000000000000000000000000000000000000000000000000000000',
+              remotes = {
+                '"gw22.ffrgb.net" port 10020',
+                '"gw22.ffrgb.net" port 10021',
+                '"gw22.ffrgb.net" port 10022',
+                '"gw22.regensburg.freifunk.net" port 10020',
+                '"gw22.regensburg.freifunk.net" port 10021',
+                '"gw22.regensburg.freifunk.net" port 10022',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+
+  autoupdater = {
+    enabled = 1,
+    branches = {
+      stable = {
+        mirrors = {
+          'http://fw.services.ffrgb/firmware-11s/stable/sysupgrade/',
+        },
+      },
+      experimental = {
+        mirrors = {
+          'http://fw.services.ffrgb/firmware-11s/experimental/sysupgrade/',
+        },
+      },
+    },
+  },
+}
+-- vim: set ft=lua:ts=2:sw=2:et

extra/default.conf

@@ -0,0 +1,17 @@
+subst = {
+	['%%SN'] = 'Bitte wählen',
+	['%%SC'] = 'ffrgb',
+	['%%GN'] = 'ffrgb_cty',
+	['%%ID'] = '01',
+	['%%V4'] = '10.90.32.0/19',
+	['%%V6'] = '10',
+	['%%N4'] = '10.90.32.1',
+	['%%MT'] = '1280',
+	['%%BS'] = '02:0E:8E:1E:61:01',
+	['%%NN'] = '16:41:95:40:f7:01',
+	['%%IB'] = 'mesh.ffrgb_cty',
+	['%%PRI'] = '185.53.218.131',
+	['%%SEC'] = '',
+	['%%PRIKEY'] = '86a4dcdbaba87fe30da03cc398a083d7a0725c44dac733b583515b188fdc63dd',
+	['%%SECKEY'] = '',
+}

extra/groups.conf

@@ -0,0 +1,66 @@
+{
+  ffrgb_cty = {
+    subst = {
+      ['%%ID'] = '01',
+      ['%%V4'] = '10.90.32.0/19',
+      ['%%V6'] = '10',
+      ['%%N4'] = '10.90.32.1',
+      ['%%MT'] = '1280',
+      ['%%BS'] = '02:0E:8E:1E:61:01',
+      ['%%NN'] = '16:41:95:40:f7:01',
+      ['%%IB'] = 'mesh.ffrgb_cty',
+      ['%%PRI'] = '185.53.218.131',
+      ['%%SEC'] = '',
+      ['%%PRIKEY'] = '86a4dcdbaba87fe30da03cc398a083d7a0725c44dac733b583515b188fdc63dd',
+      ['%%SECKEY'] = '',
+    },
+  },
+  ffrgb_uml = {
+    subst = {
+      ['%%ID'] = '02',
+      ['%%V4'] = '10.90.64.0/19',
+      ['%%V6'] = '20',
+      ['%%N4'] = '10.90.64.1',
+      ['%%MT'] = '1280',
+      ['%%BS'] = '02:0E:8E:1E:61:02',
+      ['%%NN'] = '16:41:95:40:f7:02',
+      ['%%IB'] = 'mesh.ffrgb_uml',
+      ['%%PRI'] = '185.53.218.132',
+      ['%%SEC'] = '',
+      ['%%PRIKEY'] = '0dd861f1725bb5562f96fec8a906440c1965d1b1f8a88663dea834e523d788ea',
+      ['%%SECKEY'] = '',
+    },
+  },
+  ffrgb_test = {
+    subst = {
+      ['%%ID'] = '03',
+      ['%%V4'] = '10.90.192.0/19',
+      ['%%V6'] = '30',
+      ['%%N4'] = '10.90.192.1',
+      ['%%MT'] = '1280',
+      ['%%BS'] = '02:0E:8E:1E:61:03',
+      ['%%NN'] = '16:41:95:40:f7:03',
+      ['%%IB'] = 'mesh.ffrgb_test',
+      ['%%PRI'] = '185.53.218.133',
+      ['%%SEC'] = '',
+      ['%%PRIKEY'] = '377e0246271bfbf4c99c2d156ee0eb77c16bb5629841fde507cfab6760162b61',
+      ['%%SECKEY'] = '',
+    },
+  },
+  ffrgb_legacy = {
+    subst = {
+      ['%%ID'] = '00',
+      ['%%V4'] = '10.90.0.0/19',
+      ['%%V6'] = '00',
+      ['%%N4'] = '10.90.0.1',
+      ['%%MT'] = '1426',
+      ['%%BS'] = '02:0E:8E:1E:61:17',
+      ['%%NN'] = '16:41:95:40:f7:dd',
+      ['%%IB'] = 'mesh.ffrgb',
+      ['%%PRI'] = '78.47.168.108',
+      ['%%SEC'] = '213.166.225.5',
+      ['%%PRIKEY'] = '58c2ac30c4693e8fde59c3794ac4c09748ec6a969e9688c42e144f5382e16e66',
+      ['%%SECKEY'] = '40ebfaf04da006d9150d3d8adeaab0dfa62ca645b416403537cb009bbf2125b5',
+    },
+  },
+}

extra/sites.conf

@@ -0,0 +1,45 @@
+{
+	{
+		site_name = 'Freifunk Regensburg - Stadt',
+		site_code = 'ffrgb_cty',
+		subst = {
+			['%%SS'] = 'regensburg.freifunk.net',
+		},
+		site_select = {
+			group = 'ffrgb_cty',
+		},
+	},
+	{
+		site_name = 'Freifunk Regensburg - Umland',
+		site_code = 'ffrgb_uml',
+		subst = {
+			['%%SS'] = 'regensburg.freifunk.net',
+		},
+		site_select = {
+			group = 'ffrgb_uml',
+		},
+	},
+	-- start hidden sites here --
+	{
+		site_name = 'Freifunk Regensburg - Test',
+		site_code = 'ffrgb_test',
+		subst = {
+			['%%SS'] = 'test.ffrgb.net',
+		},
+		site_select = {
+			hidden = 1,
+			group = 'ffrgb_test',
+		},
+	},
+	{
+		site_name = 'Freifunk Regensburg - Legacy',
+		site_code = 'ffrgb',
+		subst = {
+			['%%SS'] = 'regensburg.freifunk.net',
+		},
+		site_select = {
+			hidden = 1,
+			group = 'ffrgb_legacy',
+		},
+	},
+}

extra/template.conf

@@ -0,0 +1,116 @@
+{
+  hostname_prefix = '',
+  site_name = '%SN',
+  site_code = '%SC',
+
+  opkg = {
+    openwrt = 'http://downloads.openwrt.org/%n/%v/%S/packages',
+  },
+
+  prefix4 = '%V4',
+  prefix6 = 'fdef:f%V6f:1337:cafe::/64',
+
+  timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
+  ntp_servers = {'1.ntp.services.ffrgb','2.ntp.services.ffrgb'},
+
+  mesh_on_wan = true,
+
+  regdom = 'DE',
+
+  wifi24 = {
+    channel = 1,
+    ap = {
+      ssid = '%SS',
+    },
+    ibss = {
+      ssid = '%IB',
+      bssid = '%BS',
+      mcast_rate = 12000,
+    },
+  },
+
+  wifi5 = {
+    channel = 44,
+    ap = {
+      ssid = '%SS',
+    },
+    ibss = {
+      ssid = '%IB',
+      bssid = '%BS',
+      mcast_rate = 12000,
+    }
+  },
+
+  next_node = {
+    ip4 = '%N4',
+    ip6 = 'fdef:f%V6f:1337:cafe::1',
+    mac = '%NN',
+  },
+
+
+  fastd_mesh_vpn = {
+    bandwidth_limit = {
+      enabled = false,
+      ingress = 12000,
+      egress = 1200,
+    },
+    methods = {'salsa2012+umac'},
+    configurable = true,
+    mtu = '%MT',
+    groups = {
+      backbone = {
+        limit = 1,
+        peers = {
+          gwpri = {   --[[ pri gw instance 1 ]]
+            key = '%PRIKEY',
+            remotes = {
+              'ipv4 "%PRI" port 10%ID0',
+              'ipv4 "%PRI" port 10%ID1',
+              'ipv4 "%PRI" port 10%ID2',
+            },
+          },
+          gwsec = {   --[[ sec gw instance 1 ]]
+            key = '%SECKEY',
+            remotes = {
+              'ipv4 "%SEC" port 10%ID0',
+              'ipv4 "%SEC" port 10%ID1',
+              'ipv4 "%SEC" port 10%ID2',
+            },
+          },
+        },
+      },
+    },
+  },
+
+  autoupdater = {
+    enabled = 1,
+    branch = 'stable',
+    branches = {
+      stable = {
+        name = 'stable',
+        mirrors = {
+          'http://[fdef:f%V6f:1337:cafe::11]/firmware/stable/sysupgrade/',
+        },
+        good_signatures = 1,
+        pubkeys = {
+          '4d6b1a8e2ecfdb59469c38c3659916dd6046cd5270ddd31c3319b21c508eaa07', -- mephisto
+          '130ff01b6c8df0349c977a5c9539775209493bc771b713e5b3e58cc1d7c4145a', -- sven
+          'dc024622f48f25f3e11881eab29a2a015950f31c884f0043ddc78156dcfab9da', -- xaver
+        },
+      },
+      experimental = {
+        name = 'experimental',
+        mirrors = {
+          'http://[fdef:f%V6f:1337:cafe::11]/firmware/experimental/sysupgrade/',
+        },
+        good_signatures = 1,
+        pubkeys = {
+          '4d6b1a8e2ecfdb59469c38c3659916dd6046cd5270ddd31c3319b21c508eaa07', -- mephisto
+          '130ff01b6c8df0349c977a5c9539775209493bc771b713e5b3e58cc1d7c4145a', -- sven
+          'dc024622f48f25f3e11881eab29a2a015950f31c884f0043ddc78156dcfab9da', -- xaver
+        },
+      },
+    },
+  },
+}
+-- vim: set ft=lua:ts=2:sw=2:et

i18n/de.po

@@ -14,10 +14,41 @@ msgid "gluon-config-mode:welcome"
 msgstr ""
 "Willkommen zum Einrichtungsassistenten für deinen neuen Regensburger "
 "Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen "
-"entsprechend aus und sende es ab."
+"entsprechend aus und sende es ab. Die Angabe einer Kontaktmöglichkeit "
+"ist optional, ist jedoch nicht öffentlich einsehbar. Daher wäre es gut, "
+"wenn wir eine Möglichkeit haben, euch zu kontaktieren. "
+
+msgid "gluon-config-mode:domain"
+msgstr "Domain"
+
+msgid "gluon-config-mode:domain-select"
+msgstr ""
+"Hier hast du die Möglichkeit, die Domain, in der sich dein Knoten befindet, "
+"auszuwählen. Die Domain beschreibt das Gebiet, in dem dein Knoten aufgestellt "
+"werden soll. Bei uns gibt es Regensburg Stadtgebiet und Regenburg Umland. "
+"Alles was nicht innerhalb der Stadtgrenzen liegt, kommt in die Umland Domain, "
+"auch wenn sich der Knoten zB. im bayerischen Wald befindet. "
+"Bitte denke daran, dass sich dein Knoten nur mit den Knoten der "
+"ausgewählten Domain verbinden kann."
 
 msgid "gluon-config-mode:pubkey"
 msgstr ""
+"<!-- empty -->"
+
+msgid "gluon-config-mode:novpn"
+msgstr ""
+"<p>Du hast ausgewählt, <strong>kein Mesh-VPN</strong> "
+"zu nutzen. Dein Knoten kann also nur dann eine Verbindung zum Freifunk-Netz "
+"aufbauen, wenn andere Router von Freifunk Regensburg in WLAN-Reichweite ist "
+"</p>"
+
+msgid "gluon-config-mode:altitude-label"
+msgstr "Höhe"
+
+msgid "gluon-config-mode:altitude-help"
+msgstr ""
+"Die Höhenangabe ist optional und sollte nur gesetzt werden, wenn ein "
+"exakter Wert bekannt ist."
 
 msgid "gluon-config-mode:reboot"
 msgstr ""
@@ -32,6 +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 IRC Netz hackint/#freifunkR </p> "
+"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> "

i18n/en.po

@@ -12,11 +12,37 @@ msgstr ""
 
 msgid "gluon-config-mode:welcome"
 msgstr ""
-"Welcome the the setup wizard of your new Freifunk Regensburg node. "
-"Please fill out the following form and transmit it."
+"Welcome the the setup wizard of your brandnew Freifunk Regensburg node. "
+"Please fill out the following form and transmit it. The Contact field is "
+"not mandatory, but we highly recommend to leave any Information how to "
+"contact you. The Contact Information won't be published."
+
+msgid "gluon-config-mode:domain"
+msgstr "Domain"
+
+msgid "gluon-config-mode:domain-select"
+msgstr ""
+"Here you have the possibility of selecting the domain in which your node is "
+"placed. Please keep in mind that your router only connects with the nodes of "
+"the selected domain"
 
 msgid "gluon-config-mode:pubkey"
 msgstr ""
+"<!-- empty -->"
+
+msgid "gluon-config-mode:novpn"
+msgstr ""
+"<p>You have selected <strong>not</strong> to use the mesh VPN. "
+"Your node will only be able to connect to the Freifunk network if other nodes in reach "
+"already have a connection.</p> "
+
+msgid "gluon-config-mode:altitude-label"
+msgstr "Altitude"
+
+msgid "gluon-config-mode:altitude-help"
+msgstr ""
+"Specifying the altitude is optional and should only be done if a proper "
+"value is known. "
 
 msgid "gluon-config-mode:reboot"
 msgstr ""
@@ -26,5 +52,9 @@ msgstr ""
 "in a few minutes.</p> "
 "<p>To get back to this configuration interface, press the reset button for "
 "3 seconds during normal operation. The device will then reboot into config "
-"mode.</p>"
-"<p>Have fun with your node and exploring the Freifunk network!</p>"
+"mode.</p> "
+"<p>If you want to get in contact with us you are invited to visit us "
+"at our local Hackspace in the <a href=\"http://www.binary-kitchen.de\">Binary Kitchen</a> "
+"where usually Freifunk People are around, or in the "
+"<a href=\"https://webirc.hackint.org/#irc://irc.hackint.org/#freifunkRGB\">IRC</a></p>"
+"<p>Have fun with your node and exploring the Freifunk network!</p> "

modules

@@ -1,3 +1,7 @@
-GLUON_SITE_FEEDS='ffmuc_packages'
-PACKAGES_FFMUC_PACKAGES_REPO=https://github.com/freifunkMUC/gluon-packages.git
-PACKAGES_FFMUC_PACKAGES_COMMIT=82e721ad5d7c9eca8728954cfa1ab1d5b9168487
+GLUON_SITE_FEEDS='ffrgb community'
+PACKAGES_FFRGB_REPO=https://github.com/ffrgb/gluon-packages.git
+PACKAGES_FFRGB_BRANCH=master
+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
+

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

site.conf

@@ -1,65 +1,28 @@
 {
-  hostname_prefix = 'freifunk',
+  hostname_prefix = '',
   site_name = 'Freifunk Regensburg',
-  site_code = 'ffrgb-bat15',
-  opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
+  site_code = 'ffrgb',
+  default_domain = 'ffrgb_cty',
 
-  prefix4 = '10.90.0.0/16',
-  prefix6 = 'fdef:f00f:1337:cafe/64',
+  opkg = {
+    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 = true,
+  ntp_servers = {'ntp.ffrgb.net'},
 
   regdom = 'DE',
 
-  wifi24 = {
-    ssid = 'regensburg.freifunk.net',
-    channel = 1,
-    htmode = 'HT40+',
-    mesh_ssid = 'mesh.ffrgb',
-    mesh_bssid = '02:0E:8E:1E:61:17',
-    mesh_mcast_rate = 12000,
-  },
-
-  wifi5 = {
-    ssid = 'regensburg.freifunk.net',
-    channel = 44,
-    htmode = 'HT40+',
-    mesh_ssid = 'mesh.ffrgb',
-    mesh_bssid = '02:0E:8E:1E:61:17',
-    mesh_mcast_rate = 12000,
-  },
-
-  next_node = {
-    ip4 = '10.90.0.1',
-    ip6 = 'fdef:f00f:1337:cafe::1',
-    mac = '16:41:95:40:f7:dd',
-  },
-
-
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
+  mesh_vpn = {
     mtu = 1426,
-    groups = {
-      backbone = {
-      limit = 2,
-        peers = {
-          gw01 = {   --[[ sven ]]
-            key = '58c2ac30c4693e8fde59c3794ac4c09748ec6a969e9688c42e144f5382e16e66',
-            remotes = {
-              'ipv4 "78.47.168.108" port 10000',
-            },
-          },
-          gw04 = {   --[[ mephisto ]]
-            key = '40ebfaf04da006d9150d3d8adeaab0dfa62ca645b416403537cb009bbf2125b5',
-            remotes = {
-              'ipv4 "213.166.225.5" port 10000',
-            },
-          },
-        },
-      },
+    fastd = {
+      configurable = true,
+      methods = {'salsa2012+umac'},
+    },
+    bandwidth_limit = {
+      enabled = false,
+      ingress = 12000,
+      egress = 1200,
     },
   },
 
@@ -69,38 +32,51 @@
     branches = {
       stable = {
         name = 'stable',
-        mirrors = {
-          'http://[fdef:f00f:1337:cafe::11]/firmware/stable/sysupgrade/',
-        },
-        probability = 0.1,
         good_signatures = 1,
         pubkeys = {
           '4d6b1a8e2ecfdb59469c38c3659916dd6046cd5270ddd31c3319b21c508eaa07', -- mephisto
           '130ff01b6c8df0349c977a5c9539775209493bc771b713e5b3e58cc1d7c4145a', -- sven
+          'dc024622f48f25f3e11881eab29a2a015950f31c884f0043ddc78156dcfab9da', -- xaver
         },
       },
       experimental = {
         name = 'experimental',
-        mirrors = {
-          'http://[fdef:f00f:1337:cafe::11]/firmware/experimental/sysupgrade/',
-        },
-        probability = 0.5,
         good_signatures = 1,
         pubkeys = {
           '4d6b1a8e2ecfdb59469c38c3659916dd6046cd5270ddd31c3319b21c508eaa07', -- mephisto
-	  '130ff01b6c8df0349c977a5c9539775209493bc771b713e5b3e58cc1d7c4145a', -- sven
+          '130ff01b6c8df0349c977a5c9539775209493bc771b713e5b3e58cc1d7c4145a', -- sven
+          'dc024622f48f25f3e11881eab29a2a015950f31c884f0043ddc78156dcfab9da', -- xaver
         },
       },
     },
   },
 
-  simple_tc = {
-    mesh_vpn = {
-      ifname = 'mesh-vpn',
-      enabled = false,
-      limit_egress = 1200,
-      limit_ingress = 12000,
+  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,39 +1,304 @@
-GLUON_SITE_PACKAGES := \
-	gluon-mesh-batman-adv-15 \
-	gluon-alfred \
-	gluon-announced \
-	gluon-autoupdater \
-	gluon-config-mode-core \
-	gluon-config-mode-autoupdater \
-	gluon-config-mode-hostname \
-	gluon-config-mode-mesh-vpn \
-	gluon-config-mode-geo-location \
-	gluon-config-mode-contact-info \
-	gluon-ebtables-filter-multicast \
-	gluon-ebtables-filter-ra-dhcp \
-	gluon-luci-admin \
-	gluon-luci-autoupdater \
-	gluon-luci-portconfig \
-	gluon-luci-wifi-config \
-	gluon-luci-private-wifi \
-	gluon-next-node \
-	gluon-mesh-vpn-fastd \
-	gluon-radvd \
-	gluon-setup-mode \
-	gluon-status-page \
-	iwinfo \
-	iptables \
-	haveged \
-	gluon-ebtables-filter-arp-ffmuc \
-	gluon-ebtables-filter-multicast-ffmuc
+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-segment-mover \
+	iwinfo \
+	gluon-ssid-changer \
+	respondd-module-airtime \
+	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
-
-# Languages to include
+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
+
+
+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
+
+USB_PACKAGES_STORAGE := \
+	block-mount \
+	blkid \
+	kmod-fs-ext4 \
+	kmod-fs-vfat \
+	kmod-usb-storage \
+	kmod-usb-storage-extras \
+	kmod-nls-cp1250 \
+	kmod-nls-cp1251 \
+	kmod-nls-cp437 \
+	kmod-nls-cp775 \
+	kmod-nls-cp850 \
+	kmod-nls-cp852 \
+	kmod-nls-cp866 \
+	kmod-nls-iso8859-1 \
+	kmod-nls-iso8859-13 \
+	kmod-nls-iso8859-15 \
+	kmod-nls-iso8859-2 \
+	kmod-nls-koi8r \
+	kmod-nls-utf8 \
+	swap-utils
+
+# network support for USB devices
+USB_PACKAGES_NET := \
+	kmod-mii \
+	kmod-nls-base \
+	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-mbim \
+	kmod-usb-net-cdc-ncm \
+	kmod-usb-net-cdc-subset \
+	kmod-usb-net-dm9601-ether \
+	kmod-usb-net-hso \
+	kmod-usb-net-huawei-cdc-ncm \
+	kmod-usb-net-ipheth \
+	kmod-usb-net-kalmia \
+	kmod-usb-net-kaweth \
+	kmod-usb-net-mcs7830 \
+	kmod-usb-net-pegasus \
+	kmod-usb-net-qmi-wwan \
+	kmod-usb-net-rndis \
+	kmod-usb-net-rtl8152 \
+	kmod-usb-net-sierrawireless \
+	kmod-usb-net-smsc95xx
+
+USB_PACKAGES_NET_ADD := \
+	kmod-rtl8192cu \
+	kmod-rtl8187 \
+	kmod-ath9k-htc  \
+	kmod-ath9k-common \
+	kmod-ath \
+	kmod-rt73-usb \
+	kmod-carl9170 \
+	kmod-brcmfmac
+
+PCI_PACKAGES_NET := \
+	kmod-3c59x \
+	kmod-e100 \
+	kmod-e1000 \
+	kmod-e1000e \
+	kmod-forcedeth \
+	kmod-natsemi \
+	kmod-ne2k-pci \
+	kmod-pcnet32 \
+	kmod-r8169 \
+	kmod-sis900 \
+	kmod-sky2 \
+	kmod-tg3 \
+	kmod-tulip \
+	kmod-via-rhine
+
+TOOLS_PACKAGES := \
+	iperf \
+	socat \
+	tcpdump \
+	usbutils \
+	vnstat
+
+# x86-generic
+ifeq ($(GLUON_TARGET),x86-generic)
+# support the usb stack on x86 devices
+# and add a few common USB and PCI NICs
+GLUON_SITE_PACKAGES += \
+	kmod-usb-hid \
+	kmod-hid-generic \
+	kmod-button-hotplug \
+	$(USB_PACKAGES_BASIC) \
+	$(USB_PACKAGES_STORAGE) \
+	$(USB_PACKAGES_NET) \
+	$(PCI_PACKAGES_NET) \
+	$(TOOLS_PACKAGES) \
+	$(USB_PACKAGES_NET_ADD)
+endif
+
+# x86-64
+ifeq ($(GLUON_TARGET),x86-64)
+# support the usb stack on x86-64 devices
+# and add a few common USB and PCI NICs
+GLUON_SITE_PACKAGES += \
+	kmod-usb-hid \
+	kmod-hid-generic \
+	kmod-button-hotplug \
+	$(USB_PACKAGES_BASIC) \
+	$(USB_PACKAGES_STORAGE) \
+	$(USB_PACKAGES_NET) \
+	$(PCI_PACKAGES_NET) \
+	$(TOOLS_PACKAGES) \
+	$(USB_PACKAGES_NET_ADD)
+endif

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