Browse Source

Start new release 1.3.0 based on gluon 2019.1

Michael Schwarz 5 months ago
parent
commit
3635955835
2 changed files with 8 additions and 5 deletions
  1. 6 3
      extra/template.conf
  2. 2 2
      site.mk

+ 6 - 3
extra/template.conf

@@ -43,6 +43,9 @@
 	mesh = {
 		-- for now, we don't use vxlan on the mesh
 		vxlan = false,
+		batman_adv = {
+			routing_algo = 'BATMAN_IV',
+		},
 	},
 
 	-- wifi settings (2.4 GHz and 5 GHz)
@@ -182,7 +185,7 @@
 				-- where to get the manifest file (without the trailing /manifest)
 				-- It's wise to use an internal address here,
 				-- but specifying a publicly available update site does not hurt.
-				mirrors = {'http://firmware.srv.in.ffho.net/%SC/stable/sysupgrade', 'http://[2a03:2260:2342:f251::6]/%SC/stable/sysupgrade'},
+				mirrors = {'http://firmware.srv.in.ffho.net/stable/sysupgrade', 'http://[2a03:2260:2342:f251::6]/stable/sysupgrade', 'http://firmware.ffho.net/stable/sysupgrade'},
 
 				-- Number of valid manifest signatures necessary to accept the manifest as "good".
 				good_signatures = 3,
@@ -198,7 +201,7 @@
 			},
 			testing = {
 				name = 'testing',
-				mirrors = {'http://firmware.srv.in.ffho.net/%SC/testing/sysupgrade', 'http://[2a03:2260:2342:f251::6]/%SC/testing/sysupgrade'},
+				mirrors = {'http://firmware.srv.in.ffho.net/testing/sysupgrade', 'http://[2a03:2260:2342:f251::6]/testing/sysupgrade', 'http://firmware.ffho.net/testing/sysupgrade'},
 				good_signatures = 2,
 				pubkeys = {
 					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
@@ -210,7 +213,7 @@
 			},
 			experimental = {
 				name = 'experimental',
-				mirrors = {'http://firmware.srv.in.ffho.net/%SC/experimental/sysupgrade', 'http://[2a03:2260:2342:f251::6]/%SC/experimental/sysupgrade'},
+				mirrors = {'http://firmware.srv.in.ffho.net/experimental/sysupgrade', 'http://[2a03:2260:2342:f251::6]/experimental/sysupgrade', 'http://firmware.ffho.net/experimental/sysupgrade'},
 				good_signatures = 1,
 				pubkeys = {
 					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-

+ 2 - 2
site.mk

@@ -6,7 +6,6 @@ GLUON_FEATURES := \
 	config-mode-geo-location-osm \
         mesh-batman-adv-15 \
         mesh-vpn-fastd \
-        radvd \
         respondd \
         status-page \
         web-advanced \
@@ -55,7 +54,7 @@ ifeq ($(GLUON_TARGET),x86-64)
 endif
 
 # 0.2~1 < 0.2 < 0.2+1 < 0.2-1 < 0.2.1 < 0.3
-DEFAULT_GLUON_RELEASE := 1.2.2~exp$(shell date '+%Y%m%d')
+DEFAULT_GLUON_RELEASE := 1.3.0~exp$(shell date '+%Y%m%d')
 DEFAULT_GLUON_PRIORITY := 0
 
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
@@ -63,3 +62,4 @@ GLUON_PRIORITY ?= $(DEFAULT_GLUON_PRIORITY)
 GLUON_REGION ?= eu
 GLUON_LANGS ?= en de
 GLUON_ATH10K_MESH ?= 11s
+GLUON_DEPRECATED ?= full