From 0faf95b9a791448e1eb069506712b738f6e2e5c7 Mon Sep 17 00:00:00 2001 From: Jan-Philipp Litza Date: Sun, 30 Aug 2015 22:22:38 +0200 Subject: [PATCH 01/10] Prepare configuration changes for 2015.2 --- gluon | 2 +- site.conf | 32 ++++++++++++++++++++++++-------- site.mk | 1 - 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/gluon b/gluon index 30677cd..4405f39 160000 --- a/gluon +++ b/gluon @@ -1 +1 @@ -Subproject commit 30677cdc385f44005220ed105619d3a4fa9290ce +Subproject commit 4405f39869071ebd28fe5e9988a745534d6b3461 diff --git a/site.conf b/site.conf index 5aa2ef2..6b50b49 100644 --- a/site.conf +++ b/site.conf @@ -17,20 +17,36 @@ regdom = 'DE', wifi24 = { - ssid = 'bremen.freifunk.net', channel = 6, htmode = 'HT20', - mesh_ssid = 'mesh.ffhb.de', - mesh_bssid = '32:06:1C:1F:B9:E8', - mesh_mcast_rate = 6000, + ap = { + ssid = 'bremen.freifunk.net', + }, + ibss = { + ssid = 'adhoc.ffhb.de', + bssid = '32:06:1C:1F:B9:E8', + mcast_rate = 6000, + }, + mesh = { + id = 'mesh.ffhb.de', + mcast_rate = 6000, + }, }, wifi5 = { - ssid = 'bremen.freifunk.net', channel = 44, htmode = 'HT40+', - mesh_ssid = 'mesh.ffhb.de', - mesh_bssid = '32:06:1C:1F:B9:E8', - mesh_mcast_rate = 6000, + ap = { + ssid = 'bremen.freifunk.net', + }, + ibss = { + ssid = 'adhoc.ffhb.de', + bssid = '32:06:1C:1F:B9:E8', + mcast_rate = 6000, + }, + mesh = { + id = 'mesh.ffhb.de', + mcast_rate = 6000, + }, }, next_node = { diff --git a/site.mk b/site.mk index 824bdb7..483fecd 100644 --- a/site.mk +++ b/site.mk @@ -24,7 +24,6 @@ GLUON_SITE_PACKAGES := \ iputils-ping6 \ iwinfo \ iptables \ - kmod-ipt-nathelper \ firewall \ haveged From 879209b7a98f2f8fa7d03b33d7c7e551561b10da Mon Sep 17 00:00:00 2001 From: Jan-Philipp Litza Date: Thu, 3 Sep 2015 20:56:43 +0200 Subject: [PATCH 02/10] Comment out 802.11s mesh section For once, there currently is a kernel panic with that enabled as soon as another peer pops up. Also, having both IBSS and 802.11s mesh enabled at the same time uses twice as much airtime for broadcasts like OGMs, of which there are a lot. --- site.conf | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/site.conf b/site.conf index 6b50b49..45e1700 100644 --- a/site.conf +++ b/site.conf @@ -23,14 +23,14 @@ ssid = 'bremen.freifunk.net', }, ibss = { - ssid = 'adhoc.ffhb.de', + ssid = 'mesh.ffhb.de', bssid = '32:06:1C:1F:B9:E8', mcast_rate = 6000, }, - mesh = { - id = 'mesh.ffhb.de', - mcast_rate = 6000, - }, + --mesh = { + -- id = 'mesh.ffhb.de', + -- mcast_rate = 6000, + --}, }, wifi5 = { channel = 44, @@ -39,14 +39,14 @@ ssid = 'bremen.freifunk.net', }, ibss = { - ssid = 'adhoc.ffhb.de', + ssid = 'mesh.ffhb.de', bssid = '32:06:1C:1F:B9:E8', mcast_rate = 6000, }, - mesh = { - id = 'mesh.ffhb.de', - mcast_rate = 6000, - }, + --mesh = { + -- id = 'mesh.ffhb.de', + -- mcast_rate = 6000, + --}, }, next_node = { From d6aae2264cdb3b25ab90e3ba1e7c11e4b87e4ecc Mon Sep 17 00:00:00 2001 From: apuester Date: Mon, 9 Nov 2015 15:19:29 +0100 Subject: [PATCH 03/10] Readme: Add libssl-dev as dependency --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a5d3c0b..8d43587 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Um die Bremer Firmware zu bauen sind folgende Vorbereitungen notwendig: ```sh # Build-Dependencies installieren (Debian) -sudo apt-get install coreutils build-essential subversion git libncurses5-dev zlib1g-dev unzip gawk +sudo apt-get install coreutils build-essential subversion git libncurses5-dev zlib1g-dev unzip gawk libssl-dev # Dieses und das Gluon-Repository clonen git clone --recursive https://github.com/FreifunkBremen/gluon-site-ffhb.git ``` From 165c2c356601291eed61441b5bb90fbd46aafd94 Mon Sep 17 00:00:00 2001 From: Julian Kornberger Date: Sat, 12 Dec 2015 14:21:22 +0100 Subject: [PATCH 04/10] Update gluon to recent master --- gluon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gluon b/gluon index 4405f39..837c457 160000 --- a/gluon +++ b/gluon @@ -1 +1 @@ -Subproject commit 4405f39869071ebd28fe5e9988a745534d6b3461 +Subproject commit 837c457f4292e5b5f34ff1bce4d969a0ca5fc860 From f4fb457911fb4bb3077d1ad53bff737076564270 Mon Sep 17 00:00:00 2001 From: Julian Kornberger Date: Thu, 24 Dec 2015 17:11:18 +0100 Subject: [PATCH 05/10] Update gluon to recent master --- gluon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gluon b/gluon index 837c457..df018ed 160000 --- a/gluon +++ b/gluon @@ -1 +1 @@ -Subproject commit 837c457f4292e5b5f34ff1bce4d969a0ca5fc860 +Subproject commit df018ed7c7f33006565918bf7d4cc4caab631aee From 222c57e3893c6260521be00e23e1898a84e16f70 Mon Sep 17 00:00:00 2001 From: Julian Kornberger Date: Sun, 10 Jan 2016 00:25:32 +0100 Subject: [PATCH 06/10] Update gluon to recent master --- gluon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gluon b/gluon index df018ed..0880159 160000 --- a/gluon +++ b/gluon @@ -1 +1 @@ -Subproject commit df018ed7c7f33006565918bf7d4cc4caab631aee +Subproject commit 0880159eb5bc279421ebceeb63f3e81b55820c5f From a8d0425f7a584413f9a4a8e0bec6f6b0b4bc14f7 Mon Sep 17 00:00:00 2001 From: Julian Kornberger Date: Tue, 2 Feb 2016 09:35:42 +0100 Subject: [PATCH 07/10] Update gluon to recent master --- gluon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gluon b/gluon index 0880159..0005b3b 160000 --- a/gluon +++ b/gluon @@ -1 +1 @@ -Subproject commit 0880159eb5bc279421ebceeb63f3e81b55820c5f +Subproject commit 0005b3b5a2e7ceddedaff4196104d185c76d2923 From a77e460e8e1c4ce46d40b758a82e805f9b8b5429 Mon Sep 17 00:00:00 2001 From: Jan-Philipp Litza Date: Tue, 2 Feb 2016 11:13:33 +0100 Subject: [PATCH 08/10] Update to latest master, replace announced with respondd --- gluon | 2 +- site.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gluon b/gluon index df018ed..0005b3b 160000 --- a/gluon +++ b/gluon @@ -1 +1 @@ -Subproject commit df018ed7c7f33006565918bf7d4cc4caab631aee +Subproject commit 0005b3b5a2e7ceddedaff4196104d185c76d2923 diff --git a/site.mk b/site.mk index 483fecd..3d5f513 100644 --- a/site.mk +++ b/site.mk @@ -1,7 +1,7 @@ GLUON_SITE_PACKAGES := \ gluon-mesh-batman-adv-14 \ gluon-alfred \ - gluon-announced \ + gluon-respondd \ gluon-autoupdater \ gluon-config-mode-core \ gluon-config-mode-hostname \ From 8e4f96b26c862f7db2670aae435d178cada98208 Mon Sep 17 00:00:00 2001 From: Julian Kornberger Date: Sat, 6 Feb 2016 00:59:46 +0100 Subject: [PATCH 09/10] Update gluon to recent master --- gluon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gluon b/gluon index 0005b3b..e0e96b7 160000 --- a/gluon +++ b/gluon @@ -1 +1 @@ -Subproject commit 0005b3b5a2e7ceddedaff4196104d185c76d2923 +Subproject commit e0e96b7b28d7095fd4f03e6a1ed4ac0c6ef3806f From 71a503edb04a5cfd42bf842d45d0cfbd4bce9107 Mon Sep 17 00:00:00 2001 From: Julian Kornberger Date: Thu, 11 Feb 2016 12:24:52 +0100 Subject: [PATCH 10/10] Update gluon 2016.1 --- gluon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gluon b/gluon index e0e96b7..55dc9c3 160000 --- a/gluon +++ b/gluon @@ -1 +1 @@ -Subproject commit e0e96b7b28d7095fd4f03e6a1ed4ac0c6ef3806f +Subproject commit 55dc9c369d763f4b359070b2628efe46d983e0ec