enable ffho-autoupdater-wifi-fallback

Merge pull request #45 from freifunkMUC/krombel/v2018.0-on2016
Release v2018.0 (based on latest gluon-2016.2.x)
2019-03-22 17:04:25 +01:00 · 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
6 changed files with 57 additions and 6 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,20 @@
 # Freifunk München Firmware Changelog

+## v2018.0
+
+ - 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
+
 ## 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 := 35c9f9aecc5de53324ee61904faa1c5763d61134  # latest v2016.2.x

 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
--- a/4
+++ b/4
@@ -1,5 +1,5 @@
 GLUON_SITE_FEEDS='ffmuc'

 PACKAGES_FFMUC_REPO=https://github.com/freifunkMUC/gluon-packages.git
-PACKAGES_FFMUC_BRANCH=pre-new-segments
-PACKAGES_FFMUC_COMMIT=30e645af484633893e63bf8daa19da6954b15029
+PACKAGES_FFMUC_BRANCH=master
+PACKAGES_FFMUC_COMMIT=a6494aacd4504eb0c1daa0d74e6f455be9e94e50
--- a/patches/0001-openwrt-patch-iw.patch
+++ b/patches/0001-openwrt-patch-iw.patch
@@ -0,0 +1,33 @@
+From: Karsten Böddeker <freifunk@kb-light.de>
+Date: Sat, 23 Apr 2016 15:20:30 +0200
+Subject: openwrt: patch iw
+
+diff --git a/patches/openwrt/1001-iw-patch-200-reduce-size-patch.patch b/patches/openwrt/1001-iw-patch-200-reduce-size-patch.patch
+new file mode 100644
+index 0000000..09c978e
+--- /dev/null
+++ b/patches/openwrt/1001-iw-patch-200-reduce-size-patch.patch
+@@ -0,0 +1,23 @@
+From: Karsten Böddeker <freifunk@kb-light.de>
+Date: Sat, 23 Apr 2016 15:20:29 +0200
+Subject: iw: patch 200-reduce_size.patch
+
+diff --git a/package/network/utils/iw/patches/200-reduce_size.patch b/package/network/utils/iw/patches/200-reduce_size.patch
+index dea24fb..fefbf1f 100644
+--- a/package/network/utils/iw/patches/200-reduce_size.patch
++++ b/package/network/utils/iw/patches/200-reduce_size.patch
+@@ -1,12 +1,11 @@
+ --- a/Makefile
+ +++ b/Makefile
+-@@ -15,8 +15,8 @@ CFLAGS += -Wall -Wundef -Wstrict-prototy
++@@ -16,7 +16,7 @@ CFLAGS += -Wall -Wundef -Wstrict-prototy
+  OBJS = iw.o genl.o event.o info.o phy.o \
+  	interface.o ibss.o station.o survey.o util.o ocb.o \
+  	mesh.o mpath.o mpp.o scan.o reg.o version.o \
+--	reason.o status.o connect.o link.o offch.o ps.o cqm.o \
++ 	reason.o status.o connect.o link.o offch.o ps.o cqm.o \
+ -	bitrate.o wowlan.o coalesce.o roc.o p2p.o vendor.o
+-+	reason.o status.o link.o offch.o ps.o cqm.o \
+ +	bitrate.o vendor.o
+  OBJS += sections.o
+  
--- 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
--- a/site.mk
+++ b/site.mk
@@ -24,6 +24,7 @@ GLUON_SITE_PACKAGES := \
 	iwinfo \
 	iptables \
 	haveged \
+	ffho-autoupdater-wifi-fallback \
 	gluon-ebtables-filter-arp-ffmuc \
 	gluon-ebtables-filter-multicast-ffmuc \
 	tecff-ath9k-broken-wifi-workaround \
Author	SHA1	Message	Date
Krombel	e132c78b46	enable ffho-autoupdater-wifi-fallback	2019-03-22 17:04:25 +01:00
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
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