From 87ac349816dc55ab1832a96a9fabc6287236009e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 12 Aug 2016 21:14:02 +0200 Subject: [PATCH 01/18] Remove unneeded gateways --- extra/ffmuc.conf | 35 ----------------------------------- extra/ffmuc_umland.conf | 7 ------- site.conf | 35 ----------------------------------- 3 files changed, 77 deletions(-) diff --git a/extra/ffmuc.conf b/extra/ffmuc.conf index 54ad030..658a9b0 100644 --- a/extra/ffmuc.conf +++ b/extra/ffmuc.conf @@ -89,41 +89,6 @@ '"gw05.freifunk-muenchen.de" port 10001', }, }, - gw06 = { - key = 'd6834aa47a14358d804139630812276b3297e767d159c9cfd13fa6fb638000e0', - remotes = { - '"gw06.ffmuc.net" port 10001', - '"gw06.freifunk-muenchen.de" port 10001', - }, - }, - gw07 = { - key = '77b5f5189c360b245e1c934941468cc9cf57f0646465be5765593a95e54449d6', - remotes = { - '"gw07.ffmuc.net" port 10001', - '"gw07.freifunk-muenchen.de" port 10001', - }, - }, - gw08 = { - key = 'e476fb3a72365b550a23b587c0962eed362ed0c237175552b3261d22daaa2055', - remotes = { - '"gw08.ffmuc.net" port 10001', - '"gw08.freifunk-muenchen.de" port 10001', - }, - }, - gw09 = { - key = 'b86f436c9bb13b308dc92c3889fd468c46679d9df0bf4892244372ab415694d0', - remotes = { - '"gw09.ffmuc.net" port 10001', - '"gw09.freifunk-muenchen.de" port 10001', - }, - }, - gw10 = { - key = 'c04358d4818ec108fa4715e4517300cb2d0fa848dfa872770c4b8487d525e8bf', - remotes = { - '"gw10.ffmuc.net" port 10001', - '"gw10.freifunk-muenchen.de" port 10001', - }, - }, }, }, }, diff --git a/extra/ffmuc_umland.conf b/extra/ffmuc_umland.conf index b8d762d..645a1d2 100644 --- a/extra/ffmuc_umland.conf +++ b/extra/ffmuc_umland.conf @@ -96,13 +96,6 @@ '"gwu04.freifunk-muenchen.de" port 10015', }, }, - gwu05 = { - key = 'b6de9fec8569b1fcdea8e7c45224ec30513d24e01af71148c6d640b5df471950', - remotes = { - '"gwu05.ffmuc.net" port 10015', - '"gwu05.freifunk-muenchen.de" port 10015', - }, - }, }, }, }, diff --git a/site.conf b/site.conf index 54ad030..658a9b0 100644 --- a/site.conf +++ b/site.conf @@ -89,41 +89,6 @@ '"gw05.freifunk-muenchen.de" port 10001', }, }, - gw06 = { - key = 'd6834aa47a14358d804139630812276b3297e767d159c9cfd13fa6fb638000e0', - remotes = { - '"gw06.ffmuc.net" port 10001', - '"gw06.freifunk-muenchen.de" port 10001', - }, - }, - gw07 = { - key = '77b5f5189c360b245e1c934941468cc9cf57f0646465be5765593a95e54449d6', - remotes = { - '"gw07.ffmuc.net" port 10001', - '"gw07.freifunk-muenchen.de" port 10001', - }, - }, - gw08 = { - key = 'e476fb3a72365b550a23b587c0962eed362ed0c237175552b3261d22daaa2055', - remotes = { - '"gw08.ffmuc.net" port 10001', - '"gw08.freifunk-muenchen.de" port 10001', - }, - }, - gw09 = { - key = 'b86f436c9bb13b308dc92c3889fd468c46679d9df0bf4892244372ab415694d0', - remotes = { - '"gw09.ffmuc.net" port 10001', - '"gw09.freifunk-muenchen.de" port 10001', - }, - }, - gw10 = { - key = 'c04358d4818ec108fa4715e4517300cb2d0fa848dfa872770c4b8487d525e8bf', - remotes = { - '"gw10.ffmuc.net" port 10001', - '"gw10.freifunk-muenchen.de" port 10001', - }, - }, }, }, }, From 25b3852adec54d0c0431f2b2f5fef0f25044ab98 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 12 Aug 2016 21:31:01 +0200 Subject: [PATCH 02/18] ffmuc: add gw01, gw02 --- extra/ffmuc.conf | 14 ++++++++++++++ site.conf | 14 ++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/extra/ffmuc.conf b/extra/ffmuc.conf index 658a9b0..4160a1f 100644 --- a/extra/ffmuc.conf +++ b/extra/ffmuc.conf @@ -68,6 +68,20 @@ backbone = { limit = 1, peers = { + gw01 = { + key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', + remotes = { + '"gw01.ffmuc.net" port 10001', + '"gw01.freifunk-muenchen.de" port 10001', + }, + }, + gw02 = { + key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', + remotes = { + '"gw02.ffmuc.net" port 10001', + '"gw02.freifunk-muenchen.de" port 10001', + }, + }, gw03 = { key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', remotes = { diff --git a/site.conf b/site.conf index 658a9b0..4160a1f 100644 --- a/site.conf +++ b/site.conf @@ -68,6 +68,20 @@ backbone = { limit = 1, peers = { + gw01 = { + key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803', + remotes = { + '"gw01.ffmuc.net" port 10001', + '"gw01.freifunk-muenchen.de" port 10001', + }, + }, + gw02 = { + key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45', + remotes = { + '"gw02.ffmuc.net" port 10001', + '"gw02.freifunk-muenchen.de" port 10001', + }, + }, gw03 = { key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', remotes = { From 099429146c183a967f2f5657331fd993225efa29 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 13 Aug 2016 15:17:28 +0200 Subject: [PATCH 03/18] Remove gluon-alfred --- site.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/site.mk b/site.mk index 8f06cac..c87193e 100644 --- a/site.mk +++ b/site.mk @@ -1,6 +1,5 @@ GLUON_SITE_PACKAGES := \ gluon-mesh-batman-adv-15 \ - gluon-alfred \ gluon-respondd \ gluon-autoupdater \ gluon-config-mode-core \ From c4d2f66fde2525c35eaa11979050ef2790effc7d Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 8 Oct 2016 21:01:57 +0200 Subject: [PATCH 04/18] updated to current version of freifunk-gluon/v2016.2.x --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b541646..d23cac7 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build -GLUON_GIT_URL := https://github.com/freifunkmuc/gluon.git -GLUON_GIT_REF := dddade25de0c20207385c339d66d3ac7b8092136 +GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git +GLUON_GIT_REF := a54e7654cda80c8b9ea3fc991719c1e254c4f995 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From 7c5b69e932df8f1ade52bddca3be75b2c148d29c Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 8 Oct 2016 21:02:47 +0200 Subject: [PATCH 05/18] added raspberry pi build targets to makefile --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d23cac7..ca2d6b4 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,9 @@ GLUON_TARGETS ?= \ mpc85xx-generic \ x86-64 \ x86-generic \ - x86-kvm_guest + x86-kvm_guest \ + brcm2708-bcm2708 \ + brcm2708-bcm2709 GLUON_RELEASE := $(shell git describe --tags 2>/dev/null) ifneq (,$(shell git describe --exact-match --tags 2>/dev/null)) From a14cb14ee785126e7c2c2f3e120e4d34402ccda6 Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 8 Oct 2016 21:07:23 +0200 Subject: [PATCH 06/18] added GLUON_REGION setting --- site.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site.mk b/site.mk index c87193e..74ba76f 100644 --- a/site.mk +++ b/site.mk @@ -176,3 +176,5 @@ GLUON_PRIORITY ?= 0 # Languages to include GLUON_LANGS ?= en de + +GLUON_REGION := eu From 95229964635f4c8ab62188efd2663b6b826d2a98 Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 8 Oct 2016 21:11:10 +0200 Subject: [PATCH 07/18] updated to Gluon v2016.2 --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 31a372f..f7b7f9e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Freifunk München Firmware Changelog +## v2016.1 + +UNRELEASED + +- Updated to Gluon v2016.2 (upstream) + - Changes: + https://gluon.readthedocs.org/en/v2016.2/releases/v2016.2.html +- site.mk + - added GLUON_REGION = eu setting + ## v2016.0 - Updated to Gluon v2016.1.5 (ffmuc fork) - Changes: From a5c6f0a4934077aff085a5c2cc3fa17a105b77f0 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 24 Oct 2016 21:04:51 +0200 Subject: [PATCH 08/18] modules: add tecff-respondd-watchdog --- modules | 4 ++-- site.mk | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules b/modules index 20bb58e..8dbd6af 100644 --- a/modules +++ b/modules @@ -1,5 +1,5 @@ GLUON_SITE_FEEDS='ffmuc' PACKAGES_FFMUC_REPO=https://github.com/freifunkMUC/gluon-packages.git -PACKAGES_FFMUC_BRANCH=ath9k_wifi_fix -PACKAGES_FFMUC_COMMIT=b8c2b7dd024d93bc7ceb552adbe8e20f0e68dc26 +PACKAGES_FFMUC_BRANCH=master +PACKAGES_FFMUC_COMMIT=5632eaba747ac356b68f5d40f30233eafc785975 diff --git a/site.mk b/site.mk index 74ba76f..6f303a1 100644 --- a/site.mk +++ b/site.mk @@ -26,7 +26,8 @@ GLUON_SITE_PACKAGES := \ haveged \ gluon-ebtables-filter-arp-ffmuc \ gluon-ebtables-filter-multicast-ffmuc \ - tecff-ath9k-broken-wifi-workaround + tecff-ath9k-broken-wifi-workaround \ + tecff-respondd-watchdog # basic support for USB stack USB_PACKAGES_BASIC := \ From bba5ba60ec46e519fbd5775f764cc6c204fedaf0 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 24 Oct 2016 21:12:32 +0200 Subject: [PATCH 09/18] modules: switch to pre-new-segments packages for stable --- modules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules b/modules index 8dbd6af..e720240 100644 --- a/modules +++ b/modules @@ -1,5 +1,5 @@ GLUON_SITE_FEEDS='ffmuc' PACKAGES_FFMUC_REPO=https://github.com/freifunkMUC/gluon-packages.git -PACKAGES_FFMUC_BRANCH=master -PACKAGES_FFMUC_COMMIT=5632eaba747ac356b68f5d40f30233eafc785975 +PACKAGES_FFMUC_BRANCH=pre-new-segments +PACKAGES_FFMUC_COMMIT=30e645af484633893e63bf8daa19da6954b15029 From f26af0c3a6d8dd3a2e437fa302b816aebac58d76 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 24 Oct 2016 21:46:22 +0200 Subject: [PATCH 10/18] Jenkinsfile: add mattermost notifications --- Jenkinsfile | 59 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 50 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 348be44..2ea2536 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,10 +1,51 @@ -node { - stage 'Checkout' - checkout scm - - stage 'Build' - sh "make V=s" - - stage 'Archive' - archive 'output/**/*' +def _pipelineNotify(String buildStatus = 'STARTED') { + // build status of null means successful + buildStatus = buildStatus ?: 'SUCCESSFUL' + + // Default values + def colorName = 'RED' + def colorCode = '#FF0000' + def subject = "${buildStatus}: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]'" + def summary = "${subject} (${env.BUILD_URL})" + + // Override default values based on build status + if (buildStatus == 'STARTED') { + color = 'YELLOW' + colorCode = '#FFFF00' + } else if (buildStatus == 'SUCCESSFUL') { + color = 'GREEN' + colorCode = '#00FF00' + } else { + color = 'RED' + colorCode = '#FF0000' + } + + try { + mattermostSend (color: colorCode, message: summary) + } + catch (e) { + echo 'Unable to sent Mattermost notification' + } +} + +node { + try { + _pipelineNotify() + + stage 'Checkout' + checkout scm + + stage 'Build' + sh "make V=s" + + stage 'Archive' + archive 'output/**/*' + } + catch (e) { + currentBuild.result = "FAILED" + throw e + } + finally { + _pipelineNotify(currentBuild.result) + } } From 79c79d4a1368b57c81cdc05ff8354756936cc9a3 Mon Sep 17 00:00:00 2001 From: chris007de Date: Sun, 6 Nov 2016 17:20:26 +0100 Subject: [PATCH 11/18] updating to latest version of gluon upstream v2106.2.x, fixing ath9k issues --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ca2d6b4..22e1c49 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git -GLUON_GIT_REF := a54e7654cda80c8b9ea3fc991719c1e254c4f995 +GLUON_GIT_REF := 2ed35dae12e20c8d65aa23df9e98b67c13396c35 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From cc770037e734745f44cad2b3a6fee341bdaf158e Mon Sep 17 00:00:00 2001 From: chris007de Date: Fri, 11 Nov 2016 21:19:40 +0100 Subject: [PATCH 12/18] Updating to current head of upstream gluon branch v2016.2.x --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 22e1c49..12d6983 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git -GLUON_GIT_REF := 2ed35dae12e20c8d65aa23df9e98b67c13396c35 +GLUON_GIT_REF := 85ddc089ef892886de3adc15abf2578f0dcc5bc2 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From 8cb77510e5704ca24603462f97ae62733f179df3 Mon Sep 17 00:00:00 2001 From: chris007de Date: Sat, 24 Dec 2016 12:11:04 +0100 Subject: [PATCH 13/18] update to upstream gluon v2016.2.2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 12d6983..27396e3 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git -GLUON_GIT_REF := 85ddc089ef892886de3adc15abf2578f0dcc5bc2 +GLUON_GIT_REF := v2016.2.2 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From 46fece9d42c897eb76714ba2f313df90ef71c552 Mon Sep 17 00:00:00 2001 From: Oliver Heimlich Date: Tue, 7 Mar 2017 01:20:13 +0100 Subject: [PATCH 14/18] Updated to Gluon v2016.2.3 (#36) --- CHANGELOG.md | 8 ++++++-- Makefile | 2 +- README.md | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f7b7f9e..fee1e12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,13 @@ UNRELEASED -- Updated to Gluon v2016.2 (upstream) +- Updated to Gluon v2016.2.3 (upstream) - Changes: - https://gluon.readthedocs.org/en/v2016.2/releases/v2016.2.html + - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.1.6.html + - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.html + - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.1.html + - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.2.html + - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.3.html - site.mk - added GLUON_REGION = eu setting diff --git a/Makefile b/Makefile index 27396e3..01dfe21 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git -GLUON_GIT_REF := v2016.2.2 +GLUON_GIT_REF := b0c647151c6b4889bca8f9226c1456179e86b25b SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key diff --git a/README.md b/README.md index e965fe5..d45cc88 100644 --- a/README.md +++ b/README.md @@ -8,5 +8,5 @@ Check out this repository and execute `make`, i.e. like this: ## Further Resources -Look at the [site configuration related Gluon documentation](http://gluon.readthedocs.org/en/v2016.1/user/site.html) +Look at the [site configuration related Gluon documentation](https://gluon.readthedocs.io/en/v2016.2.3/user/site.html) for information on site configuration options and examples from other communities. From c0890ea7e458e5086ec405b69986098be0d3b43c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 2 Apr 2017 03:43:16 +0200 Subject: [PATCH 15/18] Update to gluon 2016.2.4 --- CHANGELOG.md | 21 +++++++++++---------- Makefile | 2 +- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fee1e12..1932f17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,15 +4,16 @@ UNRELEASED -- Updated to Gluon v2016.2.3 (upstream) - - Changes: - - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.1.6.html - - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.html - - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.1.html - - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.2.html - - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.3.html -- site.mk - - added GLUON_REGION = eu setting + - Updated to Gluon v2016.2.4 (upstream) + - Changes: + - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.1.6.html + - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.html + - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.1.html + - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.2.html + - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.3.html + - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.4.html + - site.mk + - added GLUON_REGION = eu setting ## v2016.0 - Updated to Gluon v2016.1.5 (ffmuc fork) @@ -27,7 +28,7 @@ UNRELEASED - preserve wifi channels feature (76a77902e3624167e81ca6e200519468bb66d5f7) - new package tecff-ath9k-broken-wifi-workaround (freifunkmuc/gluon-packages) - added fix for autoupdater (8f5a7c90019085dd8f02f96ab0e7a905f82e1be0) -- site.conf + - site.conf - changed MTU size to 1280 - due to the decreased MTU fastd can now support IPv6 - site.mk diff --git a/Makefile b/Makefile index 01dfe21..5dd8ec7 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git -GLUON_GIT_REF := b0c647151c6b4889bca8f9226c1456179e86b25b +GLUON_GIT_REF := 6cbd6585865b9c25002220ed33e3352f716e92d9 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From ba8ff00a735282f05bdebc7ab478333d62bd6e54 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 2 Apr 2017 15:02:33 +0200 Subject: [PATCH 16/18] Update gluon to current v2016.2.x commit --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5dd8ec7..9303ab2 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git -GLUON_GIT_REF := 6cbd6585865b9c25002220ed33e3352f716e92d9 +GLUON_GIT_REF := d452a7c2cf1c0da4e034666a50dc0e7aa9ddc592 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From 386547f1054a10c4dde982befededecacf1d2421 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 10 Jun 2017 21:32:44 +0200 Subject: [PATCH 17/18] Updatet to gluon 2016.2.6 --- CHANGELOG.md | 4 +++- Makefile | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1932f17..621654c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ UNRELEASED - - Updated to Gluon v2016.2.4 (upstream) + - Updated to Gluon v2016.2.6 (upstream) - Changes: - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.1.6.html - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.html @@ -12,6 +12,8 @@ UNRELEASED - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.2.html - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.3.html - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.4.html + - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.5.html + - https://gluon.readthedocs.io/en/v2016.2.3/releases/v2016.2.6.html - site.mk - added GLUON_REGION = eu setting diff --git a/Makefile b/Makefile index 9303ab2..15e1a24 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git -GLUON_GIT_REF := d452a7c2cf1c0da4e034666a50dc0e7aa9ddc592 +GLUON_GIT_REF := v2016.2.6 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From 9efcd65a9975ff6d2ab1ca19dc4691955fbdd38b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 12 Jul 2017 10:00:01 +0200 Subject: [PATCH 18/18] Release v2017.0 --- CHANGELOG.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 621654c..754cf96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,6 @@ # Freifunk München Firmware Changelog -## v2016.1 - -UNRELEASED +## v2017.0 - Updated to Gluon v2016.2.6 (upstream) - Changes: