Änderungen für Gluon v2018

README.md

@@ -1,15 +1,10 @@
 #### Erstellen der Freifunk Helgoland Firmware
 
-Dies sind die Informationen für die experimentelle Version
-
     git clone https://github.com/freifunk-gluon/gluon.git
     cd gluon
     git clone https://git.pinneberg.freifunk.net/thooge/site-helgo.git site
-    cd site
-    git checkout experimental
-    cd ..
     make update
-    make GLUON_TARGET=ar71xx-generic GLUON_BRANCH=experimental
+    make GLUON_TARGET=ar71xx-generic GLUON_BRANCH=stable
 
 Im [offiziellen Gluon-Repository](https://github.com/freifunk-gluon/gluon)
 ist der Build-Vorgang detailliert beschrieben.
@@ -20,7 +15,7 @@ zu finden.
 
 #### Gluon-Versionen für Helgoländer Firmware
 
-- 0.10    v2017.1.8
+- 0.10:   v2017.1.8
 - 0.9.2:  v2016.2.x latest commit
 - 0.9.1:  v2016.2.7
 - 0.9:    v2016.2.7 with batman_adv compat v15

modules

@@ -1,4 +0,0 @@
-GLUON_SITE_FEEDS='helgo_packages'
-
-PACKAGES_HELGO_PACKAGES_REPO=git://github.com/freifunk-helgoland/helgo-packages.git
-PACKAGES_HELGO_PACKAGES_COMMIT=241a9ba370c086ab27b030d6f4a7bda886859d2c

site.conf

@@ -2,11 +2,12 @@
 	hostname_prefix = 'helgo-',
 	site_name = 'Freifunk Helgoland',
 	site_code = 'helgo',
+	domain_seed = '34e135f273207a8085e4f08e4ac7d0e65302d9780f26b1640d66542d9e0d6323',
 
 	opkg = {
-		lede = 'http://opkg.services.helgo/%n/%v/%S/packages',
+		openwrt = 'http://opkg.services.helgo/%n/%v/%S/packages',
 		extra = {
-			modules = 'http://updates.helgoland.freifunk.net/experimental/modules/gluon-%GS-%GR/%S',
+			modules = 'http://updates.helgoland.freifunk.net/stable/modules/gluon-%GS-%GR/%S',
 		},
 	},
 
@@ -49,6 +50,14 @@
 		mac = '16:41:95:40:f7:dc',
 	},
 
+	mesh = {
+		vxlan = false,
+		batman_adv = {
+			gw_sel_class = 20,
+			routing_algo = 'BATMAN_IV',
+		},
+	},
+
 	mesh_vpn = {
 		enabled = true,
 		mtu = 1406,

site.mk

@@ -4,13 +4,12 @@ GLUON_SITE_PACKAGES := \
 	gluon-autoupdater \
 	gluon-config-mode-autoupdater \
 	gluon-config-mode-contact-info \
-	gluon-config-mode-core \
 	gluon-config-mode-geo-location \
 	gluon-config-mode-hostname \
 	gluon-config-mode-mesh-vpn \
 	gluon-ebtables-filter-multicast \
 	gluon-ebtables-filter-ra-dhcp \
-	gluon-ebtables-segment-mld \
+	gluon-ebtables-limit-arp \
 	gluon-web-admin \
 	gluon-web-autoupdater \
 	gluon-web-network \
@@ -20,22 +19,21 @@ GLUON_SITE_PACKAGES := \
 	gluon-mesh-vpn-fastd \
 	gluon-radvd \
 	gluon-respondd \
-	gluon-setup-mode \
 	gluon-status-page \
 	iwinfo \
 	iptables \
 	haveged
 
-DEFAULT_GLUON_RELEASE := 0.10+exp$(shell date '+%Y%m%d')
+DEFAULT_GLUON_RELEASE := 0.11
 
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
 
-GLUON_PRIORITY ?= 0
+GLUON_PRIORITY ?= 2
 
 # Region code required for some images; supported values: us eu
 GLUON_REGION ?= eu
 
-GLUON_ATH10K_MESH ?= 11s
+GLUON_WLAN_MESH ?= 11s
 
 GLUON_LANGS ?= en de