Änderungen für 2016.1.2

README

-Doku: https://gluon.readthedocs.org/en/latest/releases/v2016.1.html
+Doku: https://gluon.readthedocs.org/en/latest/releases/v2016.1.2.html
 
 Gluon versions used for specific Freifunk Nord Firmware builds:
 
-* exp~0.8 - v2016.1
+* 0.16.2 - Gluon 2016.1.2

i18n/en.po

@@ -36,7 +36,7 @@ msgid "gluon-config-mode:reboot"
 msgstr ""
 "<p>The node is currently rebooting and, afterwards, will try to connect to other "
 "nearby Freifunk nodes. "
-"You can find lots more information about the Freifunk Hamburg community on "
+"You can find lots more information about the Freifunk Nord community on "
 "<a href=\"https://nord.freifunk.net/\">our homepage</a>.</p>"
 "<p>Have fun with your node and exploring the Freifunk network!</p>"
 

site.conf

@@ -13,8 +13,12 @@
 	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
 	ntp_servers = {
 			'2a03:2267:4e6f:7264::fd00',
+			'2a03:2267:4e6f:7264::fd01',
 			'2a03:2267:4e6f:7264::fd02',
 			'2a03:2267:4e6f:7264::fd03',
+			'2a03:2267:4e6f:7264::fd04',
+			'2a03:2267:4e6f:7264::fd05',
+			'2a03:2267:4e6f:7264::fd06',
 		      },
 	regdom = 'DE',
 
@@ -114,40 +118,47 @@
 				name = 'stable',
 				mirrors = {
         			'http://[2a03:2267:4e6f:7264::fd00]/firmware/stable/sysupgrade/',
+					'http://[2a03:2267:4e6f:7264::fd01]/firmware/stable/sysupgrade/',
         			'http://[2a03:2267:4e6f:7264::fd02]/firmware/stable/sysupgrade/',
         			'http://[2a03:2267:4e6f:7264::fd03]/firmware/stable/sysupgrade/',
+					'http://[2a03:2267:4e6f:7264::fd04]/firmware/stable/sysupgrade/',
+					'http://[2a03:2267:4e6f:7264::fd05]/firmware/stable/sysupgrade/',
+					'http://[2a03:2267:4e6f:7264::fd06]/firmware/stable/sysupgrade/',	
         		},
 				good_signatures = 2,
 				pubkeys = {
         			'bbb814470889439c04667748c30aabf25fb800621e67544bee803fd1b342ace3', -- sargon
         			'e46bcbb302a250d414d2f014fc55d179693cd39c6527d120924a1e985dd8ae5f', -- DO9XE
-				'bd5a70d4c3df30eaa860d615c0e0526b0dda5bc60c09c20972bce4ffa7512659', -- bjoern
-				'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot
-				'589695821488c9acd2efc26c2fdde259b25615cbfdbb6a434e95e33fa6932023', -- Tarnatos
-				'c83161964de2763ab2fc5730dcc0f8766212f130e6b48b3b42d7f1055c05a2be', -- bigfoot
-				'ce692fd4f662710aabe32ee629b37f594ac9f3876fb324cb1fc9aaf3090a7e6e', -- rubo77
+					'bd5a70d4c3df30eaa860d615c0e0526b0dda5bc60c09c20972bce4ffa7512659', -- bjoern
+					'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot
+					'589695821488c9acd2efc26c2fdde259b25615cbfdbb6a434e95e33fa6932023', -- Tarnatos
+					'c83161964de2763ab2fc5730dcc0f8766212f130e6b48b3b42d7f1055c05a2be', -- bigfoot
+					'ce692fd4f662710aabe32ee629b37f594ac9f3876fb324cb1fc9aaf3090a7e6e', -- rubo77
 				},
 			},
-			experimental = {
+				experimental = {
         		name = 'experimental',
 				mirrors = {
         			'http://[2a03:2267:4e6f:7264::fd00]/firmware/experimental/sysupgrade/',
+					'http://[2a03:2267:4e6f:7264::fd01]/firmware/experimental/sysupgrade/',
         			'http://[2a03:2267:4e6f:7264::fd02]/firmware/experimental/sysupgrade/',
         			'http://[2a03:2267:4e6f:7264::fd03]/firmware/experimental/sysupgrade/',
+					'http://[2a03:2267:4e6f:7264::fd04]/firmware/experimental/sysupgrade/',
+					'http://[2a03:2267:4e6f:7264::fd05]/firmware/experimental/sysupgrade/',
+					'http://[2a03:2267:4e6f:7264::fd06]/firmware/experimental/sysupgrade/',
         		},
 				probability = 0.1,
 				good_signatures = 1,
 				pubkeys = {
     				'bbb814470889439c04667748c30aabf25fb800621e67544bee803fd1b342ace3', -- sargon
         			'e46bcbb302a250d414d2f014fc55d179693cd39c6527d120924a1e985dd8ae5f', -- DO9XE
-				'bd5a70d4c3df30eaa860d615c0e0526b0dda5bc60c09c20972bce4ffa7512659', -- bjoern
-				'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot
-				'589695821488c9acd2efc26c2fdde259b25615cbfdbb6a434e95e33fa6932023', -- Tarnatos
-				'c83161964de2763ab2fc5730dcc0f8766212f130e6b48b3b42d7f1055c05a2be', -- bigfoot
-				'ce692fd4f662710aabe32ee629b37f594ac9f3876fb324cb1fc9aaf3090a7e6e', -- rubo77
+					'bd5a70d4c3df30eaa860d615c0e0526b0dda5bc60c09c20972bce4ffa7512659', -- bjoern
+					'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot
+					'589695821488c9acd2efc26c2fdde259b25615cbfdbb6a434e95e33fa6932023', -- Tarnatos
+					'c83161964de2763ab2fc5730dcc0f8766212f130e6b48b3b42d7f1055c05a2be', -- bigfoot
+					'ce692fd4f662710aabe32ee629b37f594ac9f3876fb324cb1fc9aaf3090a7e6e', -- rubo77
 				},
 			},
 		},
 	},
-
 }

site.mk

@@ -27,13 +27,15 @@ GLUON_SITE_PACKAGES := \
 
 # Always call `make` from the command line with the desired release version!
 # otherwise this is generated:
-DEFAULT_GLUON_RELEASE := 0.16.0~exp$(shell date '+%y%m%d%H%M')
+DEFAULT_GLUON_RELEASE := 0.16.2~exp$(shell date '+%y%m%d%H%M')
+#DEFAULT_GLUON_RELEASE := 0.16.2
 
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
 
 GLUON_PRIORITY ?= 0
 GLUON_BRANCH ?= experimental
+#GLUON_BRANCH ?= stable
 export GLUON_BRANCH
 
 GLUON_TARGET ?= ar71xx-generic