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 · 2018-02-15 23:19:35 +00:00
9 changed files with 133 additions and 99 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,37 @@
 # Freifunk München Firmware Changelog

-## v2016.1 (not released yet)
+## 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 v2016.2.7
+   - Changes:
+     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.2.7.html
+
+## v2017.0
+
+ - Updated to Gluon v2016.2.6 (upstream)
+   - Changes:
+     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.1.6.html
+     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.2.html
+     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.2.1.html
+     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.2.2.html
+     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.2.3.html
+     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.2.4.html
+     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.2.5.html
+     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.2.6.html
+ - site.mk
+   - added GLUON_REGION = eu setting
+
+## v2016.0
 - Updated to Gluon v2016.1.5 (ffmuc fork)
   - Changes:
     - https://gluon.readthedocs.org/en/v2016.1/releases/v2016.1.html
@@ -14,8 +45,8 @@
     - new package tecff-ath9k-broken-wifi-workaround (freifunkmuc/gluon-packages)
     - added fix for autoupdater (8f5a7c90019085dd8f02f96ab0e7a905f82e1be0)
 - site.conf
-   - disabled IPv4-only fastd
-   - Changed MTU size to 1280
+   - changed MTU size to 1280
+   - due to the decreased MTU fastd can now support IPv6
 - site.mk
   - added USB support for various devices

--- a/41
+++ b/41
@@ -1,4 +1,37 @@
+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

@@ -8,3 +41,11 @@ node {
      stage 'Archive'
      archive 'output/**/*'
  }
+  catch (e) {
+      currentBuild.result = "FAILED"
+      throw e
+  }
+  finally {
+      _pipelineNotify(currentBuild.result)
+  }
+}
--- a/11
+++ b/11
@@ -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 := 35c9f9aecc5de53324ee61904faa1c5763d61134  # latest v2016.2.x

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

@@ -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))
@@ -23,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/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.
--- 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 = {
@@ -89,41 +103,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',
-            },
-          },
        },
      },
    },
--- 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',
-            },
-          },
        },
      },
    },
--- 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=ath9k_wifi_fix
-PACKAGES_FFMUC_COMMIT=b8c2b7dd024d93bc7ceb552adbe8e20f0e68dc26
+PACKAGES_FFMUC_BRANCH=pre-new-segments
+PACKAGES_FFMUC_COMMIT=30e645af484633893e63bf8daa19da6954b15029
--- 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 = {
@@ -89,41 +103,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',
-            },
-          },
        },
      },
    },
@@ -147,6 +126,9 @@
        probability = 0.1,
        good_signatures = 3,
        pubkeys = {
+          '6dcfc670a4150e16962c1852066669d9b337f168d0f6a863ed930968c2f047eb', -- awlnx
+          '5700c7a266d80aa1c6c33f29835a7b200bdd500e88ee86c0a63e24a0023364f6', -- krombel
+          '216a34d34a15688e127d8d90e6c57587aa8c682b0648322f68338487657fd5ff', -- lukesix
          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
@@ -162,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
@@ -1,6 +1,5 @@
 GLUON_SITE_PACKAGES := \
 	gluon-mesh-batman-adv-15 \
-	gluon-alfred \
 	gluon-respondd \
 	gluon-autoupdater \
 	gluon-config-mode-core \
@@ -27,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 := \
@@ -177,3 +177,5 @@ GLUON_PRIORITY ?= 0

 # Languages to include
 GLUON_LANGS ?= en de
+
+GLUON_REGION := eu
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
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
Franz Pletz	76e8a5bffd	Release v2017.1	2017-08-14 21:31:57 +02:00
Franz Pletz	9efcd65a99	Release v2017.0	2017-07-12 10:00:01 +02:00
Franz Pletz	386547f105	Updatet to gluon 2016.2.6	2017-06-10 21:34:32 +02:00
Franz Pletz	ba8ff00a73	Update gluon to current v2016.2.x commit	2017-04-02 15:03:12 +02:00
Franz Pletz	c0890ea7e4	Update to gluon 2016.2.4	2017-04-02 05:53:24 +02:00
Oliver Heimlich	46fece9d42	Updated to Gluon v2016.2.3 (#36 )	2017-04-02 05:53:24 +02:00
chris007de	8cb77510e5	update to upstream gluon v2016.2.2	2016-12-24 12:11:04 +01:00
chris007de	cc770037e7	Updating to current head of upstream gluon branch v2016.2.x	2016-11-11 21:19:40 +01:00
chris007de	79c79d4a13	updating to latest version of gluon upstream v2106.2.x, fixing ath9k issues	2016-11-06 17:20:26 +01:00
Franz Pletz	f26af0c3a6	Jenkinsfile: add mattermost notifications	2016-10-24 21:54:34 +02:00
Franz Pletz	bba5ba60ec	modules: switch to pre-new-segments packages for stable	2016-10-24 21:12:32 +02:00
Franz Pletz	a5c6f0a493	modules: add tecff-respondd-watchdog	2016-10-24 21:06:59 +02:00
chris	9522996463	updated to Gluon v2016.2	2016-10-19 00:25:53 +02:00
chris	a14cb14ee7	added GLUON_REGION setting	2016-10-19 00:25:19 +02:00
chris	7c5b69e932	added raspberry pi build targets to makefile	2016-10-19 00:25:18 +02:00
chris	c4d2f66fde	updated to current version of freifunk-gluon/v2016.2.x	2016-10-19 00:25:07 +02:00
Franz Pletz	099429146c	Remove gluon-alfred	2016-10-19 00:24:42 +02:00
Franz Pletz	25b3852ade	ffmuc: add gw01, gw02	2016-10-19 00:22:29 +02:00
Franz Pletz	87ac349816	Remove unneeded gateways	2016-10-19 00:22:20 +02:00
Franz Pletz	010e61b9ea	Release 2016.0	2016-07-28 22:47:32 +02:00