Merge pull request #45 from freifunkMUC/krombel/v2018.0-on2016

Release v2018.0 (based on latest gluon-2016.2.x)
add key of lukesix
2019-01-30 16:25:07 +01:00 · 2019-01-29 22:52:27 +01:00 · 2019-01-15 22:33:09 +01:00 · 2018-11-20 00:46:26 +01:00 · 2018-11-19 21:48:51 +01:00
3 changed files with 9 additions and 4 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,10 @@

 ## v2018.0

-UNRELEASED
-
- - Updated to Gluon v2016.2.7-2-g3d824bd2
+ - Updated to Gluon v2016.2.7-3-g35c9f9ae
   - ar71xx: fix MAC addresses on TP-Link TL-WR1043ND v4
   - modules: update url to chaos calmer git repository after upstream move
+   - ar71xx: sysupgrade: improve CPE/WBS 210/510 validation

 - Makefile
   - Enabled firmware with ath10k WLAN driver
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 GLUON_BUILD_DIR := gluon-build
 GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
-GLUON_GIT_REF := 3d824bd21d7f6d5db6dc238d2a68b62de471aa2a
+GLUON_GIT_REF := 35c9f9aecc5de53324ee61904faa1c5763d61134  # latest v2016.2.x

 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key

--- a/site.conf
+++ b/site.conf
@@ -126,6 +126,9 @@
        probability = 0.1,
        good_signatures = 3,
        pubkeys = {
+          '6dcfc670a4150e16962c1852066669d9b337f168d0f6a863ed930968c2f047eb', -- awlnx
+          '5700c7a266d80aa1c6c33f29835a7b200bdd500e88ee86c0a63e24a0023364f6', -- krombel
+          '216a34d34a15688e127d8d90e6c57587aa8c682b0648322f68338487657fd5ff', -- lukesix
          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
@@ -141,6 +144,9 @@
        probability = 0.5,
        good_signatures = 2,
        pubkeys = {
+          '6dcfc670a4150e16962c1852066669d9b337f168d0f6a863ed930968c2f047eb', -- awlnx
+          '5700c7a266d80aa1c6c33f29835a7b200bdd500e88ee86c0a63e24a0023364f6', -- krombel
+          '216a34d34a15688e127d8d90e6c57587aa8c682b0648322f68338487657fd5ff', -- lukesix
          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
Author	SHA1	Message	Date
krombel	b7c545dd0a	Merge pull request #45 from freifunkMUC/krombel/v2018.0-on2016 Release v2018.0 (based on latest gluon-2016.2.x)	2019-01-30 16:25:07 +01:00
Krombel	ce4f23cb24	add key of lukesix	2019-01-29 22:52:27 +01:00
Krombel	619250b6e8	add sign key of awlnx	2019-01-15 22:33:09 +01:00
Krombel	dd715dabfe	add public sign key for krombel	2018-11-20 00:46:26 +01:00
Krombel	5f5496ee6d	fix upgrade issues to future gluon releases v2017 and later have some changes which causes config loss when upgraded directly. This release basically aims to keep the config for a future release of a current gluon (which then has a better hardware support)	2018-11-19 21:48:51 +01:00