site.mk: Add babeld to images

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
@@ -44,9 +13,9 @@
      - preserve wifi channels feature (76a77902e3624167e81ca6e200519468bb66d5f7)
      - new package tecff-ath9k-broken-wifi-workaround (freifunkmuc/gluon-packages)
      - added fix for autoupdater (8f5a7c90019085dd8f02f96ab0e7a905f82e1be0)
- - site.conf
+- 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
 

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 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 := dddade25de0c20207385c339d66d3ac7b8092136
 
 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',
+            },
+          },
         },
       },
     },

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',
+            },
+          },
         },
       },
     },

modules

@@ -1,5 +1,5 @@
 GLUON_SITE_FEEDS='ffmuc'
 
 PACKAGES_FFMUC_REPO=https://github.com/freifunkMUC/gluon-packages.git
-PACKAGES_FFMUC_BRANCH=master
+PACKAGES_FFMUC_BRANCH=ath9k_wifi_fix
-PACKAGES_FFMUC_COMMIT=a6494aacd4504eb0c1daa0d74e6f455be9e94e50
+PACKAGES_FFMUC_COMMIT=b8c2b7dd024d93bc7ceb552adbe8e20f0e68dc26

patches/0001-openwrt-patch-iw.patch

@@ -1,33 +0,0 @@
-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
-+  

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,9 +147,6 @@
         probability = 0.1,
         good_signatures = 3,
         pubkeys = {
-          '6dcfc670a4150e16962c1852066669d9b337f168d0f6a863ed930968c2f047eb', -- awlnx
-          '5700c7a266d80aa1c6c33f29835a7b200bdd500e88ee86c0a63e24a0023364f6', -- krombel
-          '216a34d34a15688e127d8d90e6c57587aa8c682b0648322f68338487657fd5ff', -- lukesix
           '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
           '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
           '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
@@ -144,9 +162,6 @@
         probability = 0.5,
         good_signatures = 2,
         pubkeys = {
-          '6dcfc670a4150e16962c1852066669d9b337f168d0f6a863ed930968c2f047eb', -- awlnx
-          '5700c7a266d80aa1c6c33f29835a7b200bdd500e88ee86c0a63e24a0023364f6', -- krombel
-          '216a34d34a15688e127d8d90e6c57587aa8c682b0648322f68338487657fd5ff', -- lukesix
           '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
           '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
           '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris

site.mk

@@ -1,5 +1,6 @@
 GLUON_SITE_PACKAGES := \
 	gluon-mesh-batman-adv-15 \
+	gluon-alfred \
 	gluon-respondd \
 	gluon-autoupdater \
 	gluon-config-mode-core \
@@ -24,11 +25,11 @@ 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 \
-	tecff-respondd-watchdog
+	babeld \
+	ip
 
 # basic support for USB stack
 USB_PACKAGES_BASIC := \
@@ -178,5 +179,3 @@ GLUON_PRIORITY ?= 0
 
 # Languages to include
 GLUON_LANGS ?= en de
-
-GLUON_REGION := eu