Änderungen für Gluon v2017

README.md

@@ -1,16 +1,28 @@
-#### How to build the Freifunk Helgoland Firmware
+#### Erstellen der Freifunk Helgoland Firmware
 
-    git clone https://github.com/freifunk-gluon/gluon.git                  # Get the official Gluon repository
+Dies sind die Informationen für die experimentelle Version
+
+    git clone https://github.com/freifunk-gluon/gluon.git
     cd gluon
-    git clone https://github.com/freifunk-helgoland/site-helgo.git site    # Get the Freifunk Helgoland site repository
-    make update                                                          # Get other repositories used by Gluon
-    make                                                                 # Build 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
 
-Please see [the official Gluon repository](https://github.com/freifunk-gluon/gluon) for an in-depth explanation of the build process.
+Im [offiziellen Gluon-Repository](https://github.com/freifunk-gluon/gluon)
+ist der Build-Vorgang detailliert beschrieben.
 
+Weitere Hinweise sind auch im Pinneberger Wiki unter
+https://wiki.pinneberg.freifunk.net/firmware
+zu finden.
 
-#### Gluon versions used for specific Helgoland Freifunk Firmware builds
+#### Gluon-Versionen für Helgoländer Firmware
 
+- 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
 - 0.8.2:  v2016.2.7 new keys for new infrastructure
 - 0.8.1:  v2016.2.3

i18n/de.po

@@ -27,7 +27,7 @@ msgstr ""
 "kann sich dein Knoten mit dem Helgoländer Mesh-VPN verbinden. "
 "Bitte übermittle den Schlüssel an die Administration der Helgoländer Community. "
 "<div class=\"the-key\">"
-" # <%= escape(hostname) %>"
+" # <%= pcdata(hostname) %>"
 " <br/>"
 "<%= pubkey %>"
 "</div>"

i18n/en.po

@@ -26,7 +26,7 @@ msgstr ""
 "the Freifunk Helgoland servers. "
 "Please transfer your key to the administration of our community. "
 "<div class=\"the-key\">"
-" # <%= escape(hostname) %>"
+" # <%= pcdata(hostname) %>"
 " <br/>"
 "<%= pubkey %>"
 "</div>"

modules

@@ -1,4 +1,4 @@
-GLUON_SITE_FEEDS='ffhh_packages'
+GLUON_SITE_FEEDS='helgo_packages'
 
-PACKAGES_FFHH_PACKAGES_REPO=git://github.com/freifunkhamburg/ffhh-packages.git
-PACKAGES_FFHH_PACKAGES_COMMIT=ef9fcc1222f74c3c045b1450537a4b8b80efb56c
+PACKAGES_HELGO_PACKAGES_REPO=git://github.com/freifunk-helgoland/helgo-packages.git
+PACKAGES_HELGO_PACKAGES_COMMIT=241a9ba370c086ab27b030d6f4a7bda886859d2c

site.conf

@@ -4,9 +4,9 @@
 	site_code = 'helgo',
 
 	opkg = {
-		openwrt = 'http://opkg.services.ffhh/%n/%v/%S/packages',
+		lede = 'http://opkg.services.helgo/%n/%v/%S/packages',
 		extra = {
-			modules = 'http://updates.helgoland.freifunk.net/stable/archive/modules/gluon-%GS-%GR/%S',
+			modules = 'http://updates.helgoland.freifunk.net/experimental/modules/gluon-%GS-%GR/%S',
 		},
 	},
 
@@ -49,21 +49,23 @@
 		mac = '16:41:95:40:f7:dc',
 	},
 
-	fastd_mesh_vpn = {
+	mesh_vpn = {
 		enabled = true,
-		methods = {'salsa2012+umac'},
 		mtu = 1406,
-		groups = {
-			backbone = {
-				limit = 1,
-				peers = {
-					gateway01 = {
-						key = '2fa171346f800313145064d5e760af52069a3f3c6d1805c0393c747843b0eb8e',
-						remotes = {'"gw01.helgoland.freifunk.net" port 10100'},
-					},
-					gateway02 = {
-						key = '49fed2d52d01e35be758158bdbaa6ca52365c9c847da050cb5f3c67fe32a9d7c',
-						remotes = {'"gw02.helgoland.freifunk.net" port 10000'},
+		fastd = {
+			methods = {'salsa2012+umac'},
+			groups = {
+				backbone = {
+					limit = 1,
+					peers = {
+						gw02 = {
+							key = '49fed2d52d01e35be758158bdbaa6ca52365c9c847da050cb5f3c67fe32a9d7c',
+							remotes = {'"gw02.helgoland.freifunk.net" port 10000'},
+						},
+						gw03 = {
+							key = '73986bd367e8f276c08126e6595448c9b1976dfc61151ae9a399677cca11ac25',
+							remotes = {'"gw03.helgoland.freifunk.net" port 10000'},
+						},
 					},
 				},
 			},

site.mk

@@ -11,13 +11,12 @@ GLUON_SITE_PACKAGES := \
 	gluon-ebtables-filter-multicast \
 	gluon-ebtables-filter-ra-dhcp \
 	gluon-ebtables-segment-mld \
-	gluon-luci-admin \
-	gluon-luci-autoupdater \
-	gluon-luci-portconfig \
-	gluon-luci-private-wifi \
-	gluon-luci-wifi-config \
-	gluon-luci-node-role \
-	gluon-next-node \
+	gluon-web-admin \
+	gluon-web-autoupdater \
+	gluon-web-network \
+	gluon-web-private-wifi \
+	gluon-web-wifi-config \
+	gluon-web-node-role \
 	gluon-mesh-vpn-fastd \
 	gluon-radvd \
 	gluon-respondd \
@@ -27,7 +26,7 @@ GLUON_SITE_PACKAGES := \
 	iptables \
 	haveged
 
-DEFAULT_GLUON_RELEASE := 0.9
+DEFAULT_GLUON_RELEASE := 0.10+exp$(shell date '+%Y%m%d')
 
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)