From 56436a7b2043782c63b142c696c45ac6aaed7e1c Mon Sep 17 00:00:00 2001
From: Oliver Heimlich <oheim@posteo.de>
Date: Thu, 15 Feb 2018 23:35:47 +0100
Subject: [PATCH 1/3] Makefile: Introduce GLUON_ATH10K_MESH variable

---
 CHANGELOG.md | 7 +++++++
 Makefile     | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbae197..d942268 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Freifunk München Firmware Changelog
 
+## v2017.2
+
+UNRELEASED
+
+ - Makefile
+   - Enabled firmware with ath10k WLAN driver
+
 ## v2017.1
 
  - Updated to Gluon v2017.7
diff --git a/Makefile b/Makefile
index f2271a7..c17559e 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,8 @@ JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l)
 
 GLUON_MAKE := ${MAKE} -j ${JOBS} -C ${GLUON_BUILD_DIR} \
 			GLUON_RELEASE=${GLUON_RELEASE} \
-			GLUON_BRANCH=${GLUON_BRANCH}
+			GLUON_BRANCH=${GLUON_BRANCH} \
+			GLUON_ATH10K_MESH=ibss
 
 all: info
 	${MAKE} manifest

From 0d759cefa8d8009d4614167a7b60f0775c5c841b Mon Sep 17 00:00:00 2001
From: Oliver Heimlich <oheim@posteo.de>
Date: Fri, 16 Feb 2018 00:08:02 +0100
Subject: [PATCH 2/3] Fix openwrt git repository url  * Makefile: use upstream
 patch from v2016.2.x branch  * CHANGELOG.md: List upstream patches and fix
 v2017.1 release information

---
 CHANGELOG.md | 8 ++++++--
 Makefile     | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d942268..c50f6f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,14 +4,18 @@
 
 UNRELEASED
 
+ - Updated to Gluon v2016.2.7-2-g3d824bd2
+   - ar71xx: fix MAC addresses on TP-Link TL-WR1043ND v4
+   - modules: update url to chaos calmer git repository after upstream move
+
  - Makefile
    - Enabled firmware with ath10k WLAN driver
 
 ## v2017.1
 
- - Updated to Gluon v2017.7
+ - Updated to Gluon v2016.2.7
    - Changes:
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.1.7.html
+     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.2.7.html
 
 ## v2017.0
 
diff --git a/Makefile b/Makefile
index c17559e..b2141f9 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.7
+GLUON_GIT_REF := 3d824bd21d7f6d5db6dc238d2a68b62de471aa2a
 
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
 

From 9d750a2e699414138a558430759815d9368133aa Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 15 Feb 2018 23:18:59 +0000
Subject: [PATCH 3/3] v2017.1 -> v2018.0

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c50f6f1..fbfb9a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Freifunk München Firmware Changelog
 
-## v2017.2
+## v2018.0
 
 UNRELEASED