Jenkins shall sign the build

CHANGELOG.md

@@ -1,37 +1,6 @@
 # Freifunk München Firmware Changelog
 
-## v2018.0
+## v2016.1 (not released yet)
-
- - 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
@@ -42,14 +11,12 @@
      - https://gluon.readthedocs.org/en/v2016.1.5/releases/v2016.1.5.html
      - mesh_no_rebroadcast for mesh-on-wan (8b66da95f1887fc6068a6e9d6b6494c2ff4d2fb4)
      - preserve wifi channels feature (76a77902e3624167e81ca6e200519468bb66d5f7)
-     - new package tecff-ath9k-broken-wifi-workaround (freifunkmuc/gluon-packages)
-     - added fix for autoupdater (8f5a7c90019085dd8f02f96ab0e7a905f82e1be0)
  - site.conf
-   - changed MTU size to 1280
+   - disabled IPv4-only fastd
-   - due to the decreased MTU fastd can now support IPv6
+   - Changed MTU size to 1280
  - site.mk
-   - added USB support for various devices
+   - added USB support for various devices 
-
+ 
 ## v2015.7
  * New stable unified firmware for all segments with site-select feature
  * Raised required signatures for stable release to 3

Jenkinsfile

@@ -1,51 +1,10 @@
-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 {
+  stage 'Checkout'
-      _pipelineNotify()
+  checkout scm
-
+  
-      stage 'Checkout'
+  stage 'Build'
-      checkout scm
+  sh "make sign V=s"
-
+  
-      stage 'Build'
+  stage 'Archive'
-      sh "make V=s"
+  archive 'output/**/*'
-
-      stage 'Archive'
-      archive 'output/**/*'
-  }
-  catch (e) {
-      currentBuild.result = "FAILED"
-      throw e
-  }
-  finally {
-      _pipelineNotify(currentBuild.result)
-  }
 }

Makefile

@@ -1,6 +1,6 @@
 GLUON_BUILD_DIR := gluon-build
-GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
+GLUON_GIT_URL := https://github.com/freifunkmuc/gluon.git
-GLUON_GIT_REF := 35c9f9aecc5de53324ee61904faa1c5763d61134  # latest v2016.2.x
+GLUON_GIT_REF := 26b13e6c18bdb553413a1d9643dc48c2c4849191
 
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
 
@@ -10,9 +10,7 @@ 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))
@@ -25,8 +23,7 @@ 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

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](https://gluon.readthedocs.io/en/v2016.2.3/user/site.html)
+Look at the [site configuration related Gluon documentation](http://gluon.readthedocs.org/en/v2016.1/user/site.html)
 for information on site configuration options and examples from other communities.

extra/ffmuc.conf

@@ -68,20 +68,6 @@
       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 = {
@@ -103,6 +89,41 @@
               '"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',
+            },
+          },
         },
       },
     },
@@ -129,7 +150,7 @@
           '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
           '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
           '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
-          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
+          '07a118c2ece480bbff5d43ffc39796285d10de9a8e2ce878cade49207886eb0f', -- build.ffmuc.net
         },
       },
       experimental = {
@@ -144,7 +165,7 @@
           '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
           '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
           '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
-          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
+          '07a118c2ece480bbff5d43ffc39796285d10de9a8e2ce878cade49207886eb0f', -- build.ffmuc.net
         },
       },
     },

extra/ffmuc_umland.conf

@@ -96,6 +96,13 @@
               '"gwu04.freifunk-muenchen.de" port 10015',
             },
           },
+          gwu05 = {
+            key = 'b6de9fec8569b1fcdea8e7c45224ec30513d24e01af71148c6d640b5df471950',
+            remotes = {
+              '"gwu05.ffmuc.net" port 10015',
+              '"gwu05.freifunk-muenchen.de" port 10015',
+            },
+          },
         },
       },
     },
@@ -122,7 +129,7 @@
           '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
           '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
           '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
-          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
+          '07a118c2ece480bbff5d43ffc39796285d10de9a8e2ce878cade49207886eb0f', -- build.ffmuc.net
         },
       },
       experimental = {
@@ -137,7 +144,7 @@
           '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
           '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
           '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
-          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
+          '07a118c2ece480bbff5d43ffc39796285d10de9a8e2ce878cade49207886eb0f', -- build.ffmuc.net
         },
       },
     },

extra/ffmuc_welcome.conf

@@ -122,7 +122,7 @@
           '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
           '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
           '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
-          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
+          '07a118c2ece480bbff5d43ffc39796285d10de9a8e2ce878cade49207886eb0f', -- build.ffmuc.net
         },
       },
       experimental = {
@@ -137,7 +137,7 @@
           '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
           '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
           '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
-          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
+          '07a118c2ece480bbff5d43ffc39796285d10de9a8e2ce878cade49207886eb0f', -- build.ffmuc.net
         },
       },
     },

modules

@@ -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_BRANCH=bf_2016.1_json
-PACKAGES_FFMUC_COMMIT=30e645af484633893e63bf8daa19da6954b15029
+PACKAGES_FFMUC_COMMIT=c734351ddbfb0d974d05f0f75e7ad660ec7ababe

site.conf

@@ -68,20 +68,6 @@
       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 = {
@@ -103,6 +89,41 @@
               '"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',
+            },
+          },
         },
       },
     },
@@ -126,12 +147,10 @@
         probability = 0.1,
         good_signatures = 3,
         pubkeys = {
-          '6dcfc670a4150e16962c1852066669d9b337f168d0f6a863ed930968c2f047eb', -- awlnx
-          '5700c7a266d80aa1c6c33f29835a7b200bdd500e88ee86c0a63e24a0023364f6', -- krombel
           '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
           '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
           '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
-          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
+          '07a118c2ece480bbff5d43ffc39796285d10de9a8e2ce878cade49207886eb0f', -- build.ffmuc.net
         },
       },
       experimental = {
@@ -143,12 +162,10 @@
         probability = 0.5,
         good_signatures = 2,
         pubkeys = {
-          '6dcfc670a4150e16962c1852066669d9b337f168d0f6a863ed930968c2f047eb', -- awlnx
-          '5700c7a266d80aa1c6c33f29835a7b200bdd500e88ee86c0a63e24a0023364f6', -- krombel
           '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
           '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
           '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
-          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
+          '07a118c2ece480bbff5d43ffc39796285d10de9a8e2ce878cade49207886eb0f', -- build.ffmuc.net
         },
       },
     },

site.mk

@@ -1,5 +1,6 @@
 GLUON_SITE_PACKAGES := \
 	gluon-mesh-batman-adv-15 \
+	gluon-alfred \
 	gluon-respondd \
 	gluon-autoupdater \
 	gluon-config-mode-core \
@@ -25,9 +26,8 @@ GLUON_SITE_PACKAGES := \
 	iptables \
 	haveged \
 	gluon-ebtables-filter-arp-ffmuc \
-	gluon-ebtables-filter-multicast-ffmuc \
+	gluon-ebtables-filter-multicast-ffmuc
-	tecff-ath9k-broken-wifi-workaround \
+
-	tecff-respondd-watchdog
 
 # basic support for USB stack
 USB_PACKAGES_BASIC := \
@@ -177,5 +177,3 @@ GLUON_PRIORITY ?= 0
 
 # Languages to include
 GLUON_LANGS ?= en de
-
-GLUON_REGION := eu