Wireguard-Package entsorgen und dafür Tunneldigger mit rein, domains durch unsere ersetzen, gluon-ssid-changer + ffgt-banner mit rein, um eine Basis-FW mit Paketen von uns zu haben. Doch schon da ziehe ich das Problem augenscheinlich mit rein:
ffgt@kaos:~/build/gluon-ffm-v2022.1/site-ffm$ mv domains domains_wg ; rsync -av ../../gluon-ffgt-v2022.1/site-ffgt/domains .
sending incremental file list
domains/
domains/bfe.conf
domains/boy.conf
domains/fsl.conf
domains/gt8.conf
domains/gto.conf
domains/gut.conf
domains/lbg.conf
domains/mid.conf
domains/neb.conf
domains/rhw.conf
domains/wrz.conf
domains/xx1.conf
domains/xx2.conf
domains/xx3.conf
domains/xzx.conf
domains/zzz.conf
sent 39,823 bytes received 324 bytes 80,294.00 bytes/sec
total size is 38,736 speedup is 0.96
ffgt@kaos:~/build/gluon-ffm-v2022.1/site-ffm$ for i in $(cd /tmp/github/site-ffm; find . -type f | grep -v \.git | sed -e 's%^\./%%g') ; do diff -u /tmp/github/site-ffm/$i ~/build/gluon-ffm-v2022.1/site-ffm/$i 2>&1 ; done >/tmp/diff.txt
ffgt@kaos:~/build/gluon-ffm-v2022.1/site-ffm$ JOBS=36 make gluon-clean && JOBS=36 make
diff.txt lautet wie folgt:
--- /tmp/github/site-ffm/targets 2023-04-30 00:39:11.115704403 +0200
+++ /home/ffgt/build/gluon-ffm-v2022.1/site-ffm/targets 2023-04-28 01:44:57.120982260 +0200
@@ -1,25 +1 @@
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
--- /tmp/github/site-ffm/site.mk 2023-04-30 00:39:11.115704403 +0200
+++ /home/ffgt/build/gluon-ffm-v2022.1/site-ffm/site.mk 2023-04-30 00:45:43.038771287 +0200
@@ -14,19 +14,22 @@
status-page \
web-advanced \
web-private-wifi \
- web-wizard
+ web-wizard \
+ mesh-vpn-tunneldigger
+
GLUON_SITE_PACKAGES := \
ffho-ap-timer \
ffho-autoupdater-wifi-fallback \
- ffho-web-ap-timer \
ffmuc-autoupdater-next2stable \
- ffmuc-mesh-vpn-wireguard-vxlan \
ffmuc-simple-radv-filter \
iwinfo \
- respondd-module-airtime
+ respondd-module-airtime \
+ ffgt-banner \
+ gluon-ssid-changer
+
-DEFAULT_GLUON_RELEASE := v2022.10.1~exp$(shell date '+%Y%m%d%H')
+DEFAULT_GLUON_RELEASE := 1.5.1
# Allow overriding the release number from the command line
GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
@@ -36,7 +39,7 @@
GLUON_REGION ?= eu
# Languages to include
-GLUON_LANGS ?= en de
+GLUON_LANGS ?= de en
# Additional package list generated by contrib/genpkglist.py
--- /tmp/github/site-ffm/modules 2023-04-30 00:39:11.115704403 +0200
+++ /home/ffgt/build/gluon-ffm-v2022.1/site-ffm/modules 2023-04-27 16:59:17.582943739 +0200
@@ -6,7 +6,7 @@
## GLUON_SITE_FEEDS
# for each feed name given, add the corresponding PACKAGES_* lines
# documented below
-GLUON_SITE_FEEDS='ffmuc wireguard'
+GLUON_SITE_FEEDS='ffmuc wireguard ffgt'
## PACKAGES_FFMUC_REPO
# the git repository from where to clone the package feed
@@ -31,3 +31,8 @@
## PACKAGES_WIREGUARD_BRANCH
# the branch to check out
PACKAGES_WIREGUARD_BRANCH=main
+
+PACKAGES_FFGT_REPO=https://github.com/wusel42/ffgt_packages-v2020.1.git
+PACKAGES_FFGT_COMMIT=83d621e23a0b5e36296da1d3ad22e33907c222ee
+PACKAGES_FFGT_BRANCH=master
+
--- /tmp/github/site-ffm/site.conf 2023-04-30 00:39:11.115704403 +0200
+++ /home/ffgt/build/gluon-ffm-v2022.1/site-ffm/site.conf 2023-04-28 02:44:14.236870280 +0200
@@ -1,8 +1,8 @@
{
- hostname_prefix = 'ffmuc-',
- site_name = 'Freifunk München',
- site_code = 'ffmuc',
- default_domain = 'ffmuc_welt',
+ hostname_prefix = 'unconfigured-node-',
+ site_name = 'Freifunk by 4830.org e. V.',
+ site_code = '4830',
+ default_domain = 'zzz',
opkg = {
extra = {
@@ -140,6 +140,28 @@
'50bafd8216cab2ee1c11c215b528dd7c6396f3edfdab689c70ca04a9f284b931', -- grische
},
},
+ rawhide = {
+ name = 'rawhide',
+ mirrors = {'http://firmware.ipv6.4830.org/rawhide/sysupgrade'},
+ good_signatures = 1,
+ pubkeys = {
+ 'fbc997a8fd3b7372b3044cf855c660f70b0f713f8ab1dca4b9a1ae297c8f5588', -- FFGT builder
+ 'a7ac1e48f4459a995cf6bcd8d3668ca26cf36a1fe5981ddfca93d4c04632deeb', -- wusel
+ '3c09bcf54e9c2d244d7888c9d2bdea08b2f2dc249deda23ef8194a114be85390', -- QA1
+ 'f3a88717ce7ec8250b40191edf088d6f30b9179ad7ec80a8e14abfd270ff8770', -- QA2
+ },
+ },
+ tng = {
+ name = 'tng',
+ mirrors = {'http://firmware.ipv6.4830.org/tng/sysupgrade'},
+ good_signatures = 1,
+ pubkeys = {
+ 'fbc997a8fd3b7372b3044cf855c660f70b0f713f8ab1dca4b9a1ae297c8f5588', -- FFGT builder
+ 'a7ac1e48f4459a995cf6bcd8d3668ca26cf36a1fe5981ddfca93d4c04632deeb', -- wusel
+ '3c09bcf54e9c2d244d7888c9d2bdea08b2f2dc249deda23ef8194a114be85390', -- QA1
+ 'f3a88717ce7ec8250b40191edf088d6f30b9179ad7ec80a8e14abfd270ff8770', -- QA2
+ },
+ },
},
},
--- /tmp/github/site-ffm/Makefile 2023-04-30 00:39:11.111704373 +0200
+++ /home/ffgt/build/gluon-ffm-v2022.1/site-ffm/Makefile 2023-04-27 19:54:10.191167527 +0200
@@ -3,27 +3,31 @@
GLUON_GIT_REF := v2022.1.3
PATCH_DIR := ./patches
-SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
+SECRET_KEY_FILE ?= ${HOME}/build/secret-build
GLUON_TARGETS ?= $(shell cat targets | tr '\n' ' ')
GLUON_AUTOUPDATER_BRANCH := stable
+GLUON_AUTOUPDATER_ENABLED := 1
-ifneq (,$(shell git describe --exact-match --tags 2>/dev/null))
- GLUON_AUTOUPDATER_ENABLED := 1
- GLUON_RELEASE := $(shell git describe --tags 2>/dev/null)
-else
- 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
+#ifneq (,$(shell git describe --exact-match --tags 2>/dev/null))
+# GLUON_AUTOUPDATER_ENABLED := 1
+# GLUON_RELEASE := $(shell git describe --tags 2>/dev/null)
+#else
+# 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
+
+GLUON_RELEASE := 1.5.1~$(shell cat buildnumber.txt)
JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l)
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}
+ GLUON_AUTOUPDATER_ENABLED=${GLUON_AUTOUPDATER_ENABLED} \
+ --output-sync=target BUILD_LOG=1 V=s
all: info
${MAKE} manifest
@@ -34,11 +38,14 @@
@echo '# FFMUC Firmware build'
@echo '# Building release ${GLUON_RELEASE} for branch ${GLUON_AUTOUPDATER_BRANCH}'
@echo
+ $(shell test -e buildnumber.txt || echo 1 > buildnumber.txt)
+ $(shell echo $$(expr $$(cat buildnumber.txt) + 1) > buildnumber.txt)
+
build: gluon-prepare output-clean
for target in ${GLUON_TARGETS}; do \
echo ""Building target $$target""; \
- ${GLUON_MAKE} download all GLUON_TARGET="$$target"; \
+ ${GLUON_MAKE} download all GLUON_TARGET="$$target" 2>&1 | tee build_$${target}.log ; \
done
manifest: build
diff: /home/ffgt/build/gluon-ffm-v2022.1/site-ffm/domains/ffmuc_freising.conf: No such file or directory
diff: /home/ffgt/build/gluon-ffm-v2022.1/site-ffm/domains/ffmuc_uml_sued.conf: No such file or directory
diff: /home/ffgt/build/gluon-ffm-v2022.1/site-ffm/domains/ffmuc_uml_west.conf: No such file or directory
diff: /home/ffgt/build/gluon-ffm-v2022.1/site-ffm/domains/ffmuc_augsburg.conf: No such file or directory
diff: /home/ffgt/build/gluon-ffm-v2022.1/site-ffm/domains/ffmuc_uml_ost.conf: No such file or directory
diff: /home/ffgt/build/gluon-ffm-v2022.1/site-ffm/domains/ffmuc_muc_cty.conf: No such file or directory
diff: /home/ffgt/build/gluon-ffm-v2022.1/site-ffm/domains/ffmuc_gauting.conf: No such file or directory
diff: /home/ffgt/build/gluon-ffm-v2022.1/site-ffm/domains/ffmuc_muc_west.conf: No such file or directory
diff: /home/ffgt/build/gluon-ffm-v2022.1/site-ffm/domains/ffmuc_muc_ost.conf: No such file or directory
diff: /home/ffgt/build/gluon-ffm-v2022.1/site-ffm/domains/ffmuc_uml_nord.conf: No such file or directory
diff: /home/ffgt/build/gluon-ffm-v2022.1/site-ffm/domains/ffmuc_muc_nord.conf: No such file or directory
diff: /home/ffgt/build/gluon-ffm-v2022.1/site-ffm/domains/ffmuc_muc_sued.conf: No such file or directory
diff: /home/ffgt/build/gluon-ffm-v2022.1/site-ffm/domains/ffmuc_welt.conf: No such file or directory
(Ich hätte auch gerne statt ffm eine andere Community mit L2TP & Multidomain genommen, habe aber auf die Schnelle keine gefunden, die schon v2022-ready wäre. Daher der „Umweg“ über einen angepaßten ffm-Build. Ich tappe leider absolut im dunkeln, wie sich die Verhaltensänderung in (vermutlich) hostapd durch Drittpakete erzeugen lassen soll.)
Pre-v2022 gibt’s eigene, gepatchte und ggf. hochgepatchte Gluon-Versionen: 