Merge pull request #41 from oheim/stable

Makefile: Introduce GLUON_ATH10K_MESH variable
v2017.1 -> v2018.0
2018-02-15 23:19:35 +00:00 · 2018-02-15 23:18:59 +00:00 · 2018-02-16 00:08:02 +01:00 · 2018-02-15 23:35:47 +01:00
2 changed files with 16 additions and 4 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,21 @@
 # Freifunk München Firmware Changelog

+## v2018.0
+
+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

--- a/5
+++ b/5
@@ -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

@@ -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
Author	SHA1	Message	Date
Franz Pletz	2553872d1c	Merge pull request #41 from oheim/stable Makefile: Introduce GLUON_ATH10K_MESH variable	2018-02-15 23:19:35 +00:00
Franz Pletz	9d750a2e69	v2017.1 -> v2018.0	2018-02-15 23:18:59 +00:00
Oliver Heimlich	0d759cefa8	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	2018-02-16 00:08:02 +01:00
Oliver Heimlich	56436a7b20	Makefile: Introduce GLUON_ATH10K_MESH variable	2018-02-15 23:35:47 +01:00