Merge pull request #39 from freifunk-ffm/next

v3.3.1
freifunk-ffm · Sep 21, 2019 · bdd5682 · bdd5682
2 parents 6b64cae + e29fe97
commit bdd5682
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,11 @@
 ## Stable-Version der Frankfurter Freifunkfirmware
 
+### v3.3.1-stable-2109
+- Erstellt am 21.09.2019
+- letztes Patch-Release von Gluon 2018
+- Neue Hardware und Bugfixes, siehe Gluon 2018.2.3 Release-Notes
+- Basis ist Gluon [v2018.2.3](https://gluon.readthedocs.io/en/v2018.2.3/)
+
 ### v3.3-stable-0909
 - Erstellt am 09.09.2019
 - erstes 11s-only-release

diff --git a/domains/legacybat_11s.conf b/domains/legacybat_11s.conf
@@ -14,6 +14,9 @@
   -- Because of the legacy domain vxlan is be turned off.
   mesh = {
     vxlan = false,
+--    batman_adv = {
+--	   routing_algo = 'BATMAN_IV_LEGACY',
+--    },
   },
 
   -- unique network prefixes per domain

diff --git a/modules b/modules
@@ -1,7 +1,7 @@
 GLUON_SITE_FEEDS='ffffm_packages ssidchanger'
 
 PACKAGES_FFFFM_PACKAGES_REPO=git://github.com/freifunk-ffm/packages.git
-PACKAGES_FFFFM_PACKAGES_COMMIT=bb2be062be03288a476e361d19e9e201a4985673
+PACKAGES_FFFFM_PACKAGES_COMMIT=94406af836d50b3d0435565953b9a89cfcc69e73
 
 PACKAGES_SSIDCHANGER_REPO=https://github.com/freifunk-nord/gluon-ssid-changer.git
 PACKAGES_SSIDCHANGER_COMMIT=7b5b7cab11d186696b4d2319f74145b0aaeb0c3c

diff --git a/site.conf b/site.conf
@@ -115,7 +115,7 @@
 
   opkg = {
     extra = {
-      modules = 'http://updates.services.ffffm.net/stable/sysupgrade/modules/gluon-%GS-%GR/%S',
+      modules = 'http://updates.services.ffffm.net/modules/gluon-%GS-%GR/%S',
     },
   },
 

diff --git a/site.mk b/site.mk
@@ -38,7 +38,7 @@ GLUON_MULTIDOMAIN := 1
 # This is the Stable branch
 
 # Gluon Base Release
-DEFAULT_GLUON_RELEASE := v3.3
+DEFAULT_GLUON_RELEASE := v3.3.1
 
 # Development branch information
 GLUON_BRANCH ?= stable
@@ -59,3 +59,6 @@ GLUON_REGION ?= eu
 
 # Prefer ath10k firmware with given mesh support (ibss or 11s)
 GLUON_WLAN_MESH ?= 11s
+
+# Build only sysupgrade for deprecated
+GLUON_DEPRECATED ?= upgrade