From 2c4d21b3663f60126c8249ff72133b888a3a474d Mon Sep 17 00:00:00 2001 From: bdobe Date: Sat, 3 Oct 2015 17:24:21 +0200 Subject: [PATCH 1/5] Update Branch v0.7.x --- site.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.mk b/site.mk index c7a6ba1..c7fedc3 100644 --- a/site.mk +++ b/site.mk @@ -25,7 +25,7 @@ GLUON_SITE_PACKAGES := \ haveged -DEFAULT_GLUON_RELEASE := 0.7 +DEFAULT_GLUON_RELEASE := 0.7+exp$(shell date '+%Y%m%d') # Allow overriding the release number from the command line GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE) From 127956a1ba1ea3c719ca1098d2cab97f26ac2b60 Mon Sep 17 00:00:00 2001 From: bdobe Date: Sat, 3 Oct 2015 17:38:12 +0200 Subject: [PATCH 2/5] Change VPN mtu to 1280 --- site.conf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/site.conf b/site.conf index d712891..8b83dda 100644 --- a/site.conf +++ b/site.conf @@ -38,22 +38,22 @@ fastd_mesh_vpn = { enabled = true, methods = {'salsa2012+umac'}, - mtu = 1406, + mtu = 1280, groups = { backbone = { limit = 1, peers = { gateway01 = { key = 'cb09c68e2d2f7d374d47035cd532e0a60b8b3a7447aa5a7f76f4f15c8ffa9e58', - remotes = {'"gw01.hamburg.freifunk.net" port 10000'}, + remotes = {'"gw01.hamburg.freifunk.net" port 10001'}, }, gateway02 = { key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0', - remotes = {'"gw02.hamburg.freifunk.net" port 10000'}, + remotes = {'"gw02.hamburg.freifunk.net" port 10001'}, }, gateway03 = { key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546', - remotes = {'"gw03.hamburg.freifunk.net" port 10000'}, + remotes = {'"gw03.hamburg.freifunk.net" port 10001'}, }, gateway04 = { key = 'fca88dd58316f4ab50d2a697123dddf4d0ba3aad52ddeb0ba7835cdbbeb60dbf', @@ -107,7 +107,7 @@ 'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo '3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre '1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot - }, + }, }, experimental = { name = 'experimental', From 38456c8b195dd042fba882f9a60bdbffa631e6a3 Mon Sep 17 00:00:00 2001 From: bdobe Date: Sun, 4 Oct 2015 22:03:35 +0200 Subject: [PATCH 3/5] Add package gluon-ebtables-filter-multicast-ffhh --- modules | 2 +- site.mk | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules b/modules index 0456a56..6ab3042 100644 --- a/modules +++ b/modules @@ -1,4 +1,4 @@ GLUON_SITE_FEEDS='ffhh_packages' PACKAGES_FFHH_PACKAGES_REPO=git://github.com/freifunkhamburg/ffhh-packages.git -PACKAGES_FFHH_PACKAGES_COMMIT=818765060bc76a109dde1558513fd086e5973ef1 +PACKAGES_FFHH_PACKAGES_COMMIT=5d6b96cd2d87fda14a6569e74382f7513e168e46 diff --git a/site.mk b/site.mk index c7fedc3..5077edf 100644 --- a/site.mk +++ b/site.mk @@ -9,6 +9,7 @@ GLUON_SITE_PACKAGES := \ gluon-config-mode-mesh-vpn \ gluon-config-mode-reboot-ffhh \ gluon-ebtables-filter-multicast \ + gluon-ebtables-filter-multicast-ffhh \ gluon-ebtables-filter-ra-dhcp \ gluon-legacy \ gluon-luci-admin \ From c34140504bd3e767c32857796595a9f7ae659490 Mon Sep 17 00:00:00 2001 From: bdobe Date: Mon, 12 Oct 2015 22:04:14 +0200 Subject: [PATCH 4/5] Add package fastd-traffic-status --- modules | 2 +- site.mk | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules b/modules index 6ab3042..bf36246 100644 --- a/modules +++ b/modules @@ -1,4 +1,4 @@ GLUON_SITE_FEEDS='ffhh_packages' PACKAGES_FFHH_PACKAGES_REPO=git://github.com/freifunkhamburg/ffhh-packages.git -PACKAGES_FFHH_PACKAGES_COMMIT=5d6b96cd2d87fda14a6569e74382f7513e168e46 +PACKAGES_FFHH_PACKAGES_COMMIT=0a70ceb1c636a5a21ce47e39513031e3794daea2 diff --git a/site.mk b/site.mk index 5077edf..ee11d3f 100644 --- a/site.mk +++ b/site.mk @@ -4,7 +4,7 @@ GLUON_SITE_PACKAGES := \ gluon-announced \ gluon-autoupdater \ gluon-config-mode-autoupdater \ - gluon-config-mode-core \ + gluon-config-mode-core \ gluon-config-mode-hostname \ gluon-config-mode-mesh-vpn \ gluon-config-mode-reboot-ffhh \ @@ -19,8 +19,9 @@ GLUON_SITE_PACKAGES := \ gluon-next-node \ gluon-mesh-vpn-fastd \ gluon-radvd \ - gluon-setup-mode \ + gluon-setup-mode \ gluon-status-page \ + fastd-traffic-status \ iwinfo \ iptables \ haveged From 09df081aaa60fc8e48105081faaee22fbae0fa86 Mon Sep 17 00:00:00 2001 From: bdobe Date: Fri, 30 Oct 2015 21:45:01 +0100 Subject: [PATCH 5/5] Release v0.7.1 --- README.md | 5 +++-- site.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 0c25f5d..4b6f26b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ #### How to build the Freifunk Hamburg Firmware - + git clone https://github.com/freifunk-gluon/gluon.git # Get the official Gluon repository cd gluon git clone https://github.com/freifunkhamburg/site-ffhh.git site # Get the Freifunk Hamburg site repository @@ -11,6 +11,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu #### Gluon versions used for specific Hamburg Freifunk Firmware builds +- 0.7.1: v2015.1.2 - 0.7: v2015.1 - 0.6: v2014.4 - 0.5: v2014.3 @@ -19,4 +20,4 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu - 0.4.1: v2014.2-hh - equal to official gluon v2014.2 + ffhh specific patches - 0.4a: v2014.1a - - equal to official gluon v2014.1 + ffhh specific patches + - equal to official gluon v2014.1 + ffhh specific patches diff --git a/site.mk b/site.mk index ee11d3f..5f9e2fe 100644 --- a/site.mk +++ b/site.mk @@ -27,7 +27,7 @@ GLUON_SITE_PACKAGES := \ haveged -DEFAULT_GLUON_RELEASE := 0.7+exp$(shell date '+%Y%m%d') +DEFAULT_GLUON_RELEASE := 0.7.1 # Allow overriding the release number from the command line GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)