.build/build.sh

@@ -87,11 +87,8 @@ while read line; do
     # extract arcitecture parameter value
     targ=$(echo $line | sed -e 's/^.*GluonTarget//' -e 's/^,//' -e 's/)).*//' -e 's/[,]/-/')
 
-    # detect last gluon commit ID for release flag
-    rev=$(git log | grep -m 1 commit | tail -c41 | head -c7)
-
     #Build arcitecture images
-    make -j $((CPUS*2)) GLUON_TARGET=$targ BROKEN=1 GLUON_RELEASE=$rev GLUON_BRANCH=$GLUON_BRANCH || exit 1
+    make -j $((CPUS*2)) GLUON_TARGET=$targ BROKEN=1 GLUON_BRANCH=$GLUON_BRANCH || exit 1
   fi;
 done < "targets/targets.mk"
 

i18n/de.po

@@ -30,7 +30,7 @@ msgstr ""
 " <br/>"
 "Bei Fragen oder Problemen helfen wir dir gerne unter "
 "<a href=\"https://ffnw.de\">https://ffnw.de</a>"
-"weiter."
+" weiter."
 "</p>"
 
 msgid "gluon-config-mode:reboot"

modules

 GLUON_SITE_FEEDS='ffnw'
 
 PACKAGES_FFNW_REPO=https://git.nordwest.freifunk.net/ffnw-firmware/packages.git
-PACKAGES_FFNW_BRANCH=201701
-PACKAGES_FFNW_COMMIT=7bfc37e489dc12b3a88564bd2395b49dcceac5bf
+PACKAGES_FFNW_BRANCH=201702
+PACKAGES_FFNW_COMMIT=4e6cade158775afd66ba6079641875306b003894

site.conf

@@ -5,6 +5,9 @@
 
 	opkg = {
 		openwrt = 'http://mirror.ffnw.de/openwrt/%n/%v/%S/packages',
+		extra = {
+			modules = 'http://mirror.ffnw.de/modules/gluon-%GS-%GR/%S',
+		},
 	},
 
 	prefix4 = '10.18.0.0/16',
@@ -23,6 +26,8 @@
 	wifi24 = {
 		channel = 6,
 		htmode = 'HT40+',
+		supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+		basic_rate = {6000, 9000, 18000, 36000, 54000},
 		ap = {
 			ssid = 'nordwest.freifunk.net',
 		},
@@ -78,25 +83,25 @@
 			backbone = {
 				limit = 1,
 				peers = {
-					vpn02_default = {
+					default02 = {
 						key = '32a02dd5e6b9233926e178ac609023ad30bcf26954d38d410088bbdc0b2258cb',
-						remotes = {'"vpn02.ffnw.de" port 11111'},
+						remotes = {'"default02.ffnw.de" port 11111'},
 					},
-					vpn03_default = {
+					default03 = {
 						key = '9737c65a17cfaa8339315ee53d2b9e02520733780362efacf9503737f5a23204',
-						remotes = {'"vpn03.ffnw.de" port 11111'},
+						remotes = {'"default03.ffnw.de" port 11111'},
 					},
-					vpn04_default = {
+					default04 = {
 						key = '18199a10620dbd13728a09402ca2364436ca27e46e669a2ebdfe20976dc45e6f',
-						remotes = {'"vpn04.ffnw.de" port 11111'},
+						remotes = {'"default04.ffnw.de" port 11111'},
 					},
-					vpn05_default = {
+					default05 = {
 						key = '5c1738236ba6930f654fd5e815e0c63ac03f81551ee2b183045b256fb133f77d',
-						remotes = {'"vpn05.ffnw.de" port 11111'},
+						remotes = {'"default05.ffnw.de" port 11111'},
 					},
-					vpn06_default = {
+					default06 = {
 						key ='22e270ff9b2d1017c3a0b00dd22a58ef7e5915a355eeb16f0b8b52d7eb377869',
-						remotes = {'"vpn06.ffnw.de" port 11111'},
+						remotes = {'"default06.ffnw.de" port 11111'},
 					},
 				},
 			},
@@ -128,6 +133,7 @@
 					'36dff98a686a15d7fb129fe98df7977c7d53919aa512b825356bd8d638fca534', --PowerPan
 					'13f022eb0704007a58a6a68952feaa5a91af4015db46f13bf3eb676a06e926f2', --fkr
 					'cc2e9b38ebe37613aa05bde6c0543a97a72940b1eee9f8ab89236e804cf0a3ff', --lethexa
+					'd3a4cbc90a2d4dbfc5386dd035016a04bfdfe1e7615fa8ea25bea5c048a7f106', --lrnzo
 				},
 			},
 			testing = {
@@ -145,6 +151,7 @@
 					'1f45d9be8a07cc2b6fcc384c71685fc0895a54be0d884aa4637c93ec4f36d970', --stefan6
 					'36dff98a686a15d7fb129fe98df7977c7d53919aa512b825356bd8d638fca534', --PowerPan
 					'13f022eb0704007a58a6a68952feaa5a91af4015db46f13bf3eb676a06e926f2', --fkr
+					'd3a4cbc90a2d4dbfc5386dd035016a04bfdfe1e7615fa8ea25bea5c048a7f106', --lrnzo
 				},
 			},
 			nightly_master = {
@@ -164,28 +171,8 @@
 		skip = false,
 	},
 
-	simple_tc = {
-		mesh_vpn = {
-			ifname = "mesh-vpn",
-			enabled = false,
-			limit_egress = 500,
-			limit_ingress = 8000,
-		},
-	},
-
 	location = {
 		autolocation = 1,
 		interval = 1000,
 	},
-
-legacy = {
-		version_files = {'/etc/.freifunk_version_keep', '/etc/.lff_version_keep'},
-		old_files = {'/etc/config/config_mode', '/etc/config/ffnw', '/etc/config/freifunk'},
-
-		config_mode_configs = {'config_mode', 'ffnw', 'freifunk'},
-		fastd_configs = {'ffnw_mesh_vpn', 'mesh_vpn'},
-		mesh_ifname = 'freifunk',
-		tc_configs = {'ffnw', 'freifunk'},
-		wifi_names = {'wifi_freifunk', 'wifi_freifunk5', 'wifi_mesh', 'wifi_mesh5'},
-	},
 }

site.mk

@@ -18,7 +18,6 @@ GLUON_SITE_PACKAGES := \
 	gluon-radvd \
 	gluon-setup-mode \
 	gluon-status-page \
-	gluon-legacy \
 	haveged \
 	iwinfo \
 	ffnw-banner \
@@ -56,7 +55,7 @@ ifeq ($(GLUON_TARGET),x86-64)
 		kmod-igb
 endif
 
-DEFAULT_GLUON_RELEASE := 0.8+exp$(shell date '+%Y%m%d')
+DEFAULT_GLUON_RELEASE := $(shell date '+%Y%m%d')-$(shell git log -1 --pretty=format:%h)
 DEFAULT_GLUON_PRIORITY := 0
 DEFAULT_GLUON_REGION := eu