foo

add some more fixes from upstream gluon
added fix for autoupdater from gluon upstream
2016-07-28 00:55:01 +02:00 · 2016-07-25 20:02:56 +02:00 · 2016-07-22 17:15:44 +02:00 · 2016-07-13 22:03:15 +02:00 · 2016-06-26 14:19:56 +02:00 · 2016-06-13 18:42:39 +02:00
13 changed files with 752 additions and 60 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 gluon-build
+output
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,39 @@
 # Freifunk München Firmware Changelog

+## v2016.1 (not released yet)
+ - Updated to Gluon v2016.1.5 (ffmuc fork)
+   - Changes:
+     - https://gluon.readthedocs.org/en/v2016.1/releases/v2016.1.html
+     - https://gluon.readthedocs.org/en/v2016.1.1/releases/v2016.1.1.html
+     - https://gluon.readthedocs.org/en/v2016.1.2/releases/v2016.1.2.html
+     - https://gluon.readthedocs.org/en/v2016.1.3/releases/v2016.1.3.html
+     - https://gluon.readthedocs.org/en/v2016.1.4/releases/v2016.1.4.html
+     - 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
+   - disabled IPv4-only fastd
+   - Changed MTU size to 1280
+ - site.mk
+   - 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
+
+## v2015.6.2
+ * Bugfix build for welcome version
+
+## v2015.6.1
+ * Added support of site selection in config mode
+ * Switch autoupdater URL back to main firmware repo path
+
+## v2015.6
+ - Updated to Gluon 2015.1.2
+   - Changes: https://gluon.readthedocs.org/en/v2015.1.2/releases/v2015.1.2.html
+
 ## v2015.5
 - Updated to Gluon 2015.1.1
   - Fixes some problems with mesh on LAN setups
--- a/10
+++ b/10
@@ -0,0 +1,10 @@
+node {
+  stage 'Checkout'
+  checkout scm
+  
+  stage 'Build'
+  sh "make V=s"
+  
+  stage 'Archive'
+  archive 'output/**/*'
+}
--- a/25
+++ b/25
@@ -1,12 +1,15 @@
 GLUON_BUILD_DIR := gluon-build
-GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
-GLUON_GIT_REF := v2015.1.1
+GLUON_GIT_URL := https://github.com/freifunkmuc/gluon.git
+GLUON_GIT_REF := dddade25de0c20207385c339d66d3ac7b8092136

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

 GLUON_TARGETS ?= \
 	ar71xx-generic \
 	ar71xx-nand \
+	mpc85xx-generic \
+	x86-64 \
+	x86-generic \
 	x86-kvm_guest

 GLUON_RELEASE := $(shell git describe --tags 2>/dev/null)
@@ -16,7 +19,9 @@ else
  GLUON_BRANCH := experimental
 endif

-GLUON_MAKE := ${MAKE} -C ${GLUON_BUILD_DIR} \
+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}

@@ -26,7 +31,7 @@ all: info
 info:
 	@echo
 	@echo '#########################'
-	@echo '# FFMUC Firmare build'
+	@echo '# FFMUC Firmware build'
 	@echo '# Building release ${GLUON_RELEASE} for branch ${GLUON_BRANCH}'
 	@echo

@@ -38,15 +43,15 @@ build: gluon-prepare

 manifest: build
 	${GLUON_MAKE} manifest
-	mv ${GLUON_BUILD_DIR}/images .
+	mv ${GLUON_BUILD_DIR}/output .

 sign: manifest
-	${GLUON_BUILD_DIR}/contrib/sign.sh ${SECRET_KEY_FILE} images/sysupgrade/${GLUON_BRANCH}.manifest
+	${GLUON_BUILD_DIR}/contrib/sign.sh ${SECRET_KEY_FILE} output/images/sysupgrade/${GLUON_BRANCH}.manifest

 ${GLUON_BUILD_DIR}:
 	git clone ${GLUON_GIT_URL} ${GLUON_BUILD_DIR}

-gluon-prepare: images-clean ${GLUON_BUILD_DIR}
+gluon-prepare: output-clean ${GLUON_BUILD_DIR}
 	(cd ${GLUON_BUILD_DIR} \
 	  && git remote set-url origin ${GLUON_GIT_URL} \
 	  && git fetch origin \
@@ -57,7 +62,7 @@ gluon-prepare: images-clean ${GLUON_BUILD_DIR}
 gluon-clean:
 	rm -rf ${GLUON_BUILD_DIR}

-images-clean:
-	rm -rf images
+output-clean:
+	rm -rf output

-clean: gluon-clean images-clean
+clean: gluon-clean output-clean
--- 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/v2014.3.1/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.
--- a/extra/ffmuc.conf
+++ b/extra/ffmuc.conf
@@ -0,0 +1,175 @@
+{
+  hostname_prefix = '',
+  site_name = 'Freifunk München',
+  site_code = 'ffmuc',
+
+  opkg = {
+    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+  },
+
+  prefix4 = '10.80.32.0/19',
+  prefix6 = 'fdef:ffc0:4fff::/64',
+
+  timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
+  ntp_servers = { '0.ntp.ffmuc.net', '1.ntp.ffmuc.net' },
+
+  mesh_on_wan = false,
+
+  regdom = 'DE',
+
+  wifi24 = {
+    channel = 6,
+    ap = {
+      ssid = 'muenchen.freifunk.net',
+    },
+    --mesh = {
+    --  id = 'ffmuc-mesh',
+    --  mcast_rate = 12000,
+    --},
+    ibss = {
+      ssid = 'mesh.ffmuc',
+      bssid = '02:0E:8E:1E:61:17',
+      mcast_rate = 12000,
+    },
+  },
+
+  wifi5 = {
+    channel = 44,
+    ap = {
+      ssid = 'muenchen.freifunk.net',
+    },
+    --mesh = {
+    --  id = 'ffmuc-mesh',
+    --  mcast_rate = 12000,
+    --},
+    ibss = {
+      ssid = 'mesh.ffmuc',
+      bssid = '02:0E:8E:1E:61:17',
+      mcast_rate = 12000,
+    },
+  },
+
+  mesh = {
+    batman_adv = {
+      gw_sel_class = 3,
+    },
+  },
+
+  next_node = {
+    ip4 = '10.80.32.1',
+    ip6 = 'fdef:ffc0:4fff::1',
+    mac = '16:41:95:40:f7:dc',
+  },
+
+  fastd_mesh_vpn = {
+    methods = {'salsa2012+umac'},
+    mtu = 1280,
+    groups = {
+      backbone = {
+      limit = 1,
+        peers = {
+          gw03 = {
+            key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
+            remotes = {
+              '"gw03.ffmuc.net" port 10001',
+              '"gw03.freifunk-muenchen.de" port 10001',
+            },
+          },
+          gw04 = {
+            key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
+            remotes = {
+              '"gw04.ffmuc.net" port 10001',
+              '"gw04.freifunk-muenchen.de" port 10001',
+            },
+          },
+          gw05 = {
+            key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
+            remotes = {
+              '"gw05.ffmuc.net" port 10001',
+              '"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',
+            },
+          },
+        },
+      },
+    },
+    bandwidth_limit = {
+      enabled = false,
+      egress = 1500,
+      ingress = 12000,
+    },
+  },
+
+  autoupdater = {
+    enabled = 1,
+    branch = 'stable',
+    branches = {
+      stable = {
+        name = 'stable',
+        mirrors = {
+          'http://firmware.ffmuc.net/stable/sysupgrade/',
+          'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/',
+        },
+        probability = 0.1,
+        good_signatures = 3,
+        pubkeys = {
+          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
+          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
+          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
+          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
+        },
+      },
+      experimental = {
+        name = 'experimental',
+        mirrors = {
+          'http://firmware.ffmuc.net/experimental/sysupgrade/',
+          'http://[fdef:ffc0:4fff::130]/experimental/sysupgrade/',
+        },
+        probability = 0.5,
+        good_signatures = 2,
+        pubkeys = {
+          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
+          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
+          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
+          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
+        },
+      },
+    },
+  },
+
+}
+-- vim: set ft=lua:ts=2:sw=2:et
--- a/extra/ffmuc_umland.conf
+++ b/extra/ffmuc_umland.conf
@@ -0,0 +1,154 @@
+{
+  hostname_prefix = '',
+  site_name = 'Freifunk München Umland',
+  site_code = 'ffmuc_umland',
+
+  opkg = {
+    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+  },
+
+  prefix4 = '10.80.96.0/19',
+  prefix6 = 'fdef:ffc0:4fff:2::/64',
+
+  timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
+  ntp_servers = { '0.ntp.ffmuc.net', '1.ntp.ffmuc.net' },
+
+  mesh_on_wan = false,
+
+  regdom = 'DE',
+
+  wifi24 = {
+    channel = 6,
+    ap = {
+      ssid = 'muenchen.freifunk.net',
+    },
+    --mesh = {
+    --  id = 'ffmuc-umland-mesh',
+    --  mcast_rate = 12000,
+    --},
+    ibss = {
+      ssid = 'mesh.ffmuc.umland',
+      bssid = '02:0E:8E:1E:61:19',
+      mcast_rate = 12000,
+    },
+  },
+
+  wifi5 = {
+    channel = 44,
+    ap = {
+      ssid = 'muenchen.freifunk.net',
+    },
+    --mesh = {
+    --  id = 'ffmuc-umland-mesh',
+    --  mcast_rate = 12000,
+    --},
+    ibss = {
+      ssid = 'mesh.ffmuc.umland',
+      bssid = '02:0E:8E:1E:61:19',
+      mcast_rate = 12000,
+    },
+  },
+
+  mesh = {
+    batman_adv = {
+      gw_sel_class = 3,
+    },
+  },
+
+  next_node = {
+    ip4 = '10.80.96.1',
+    ip6 = 'fdef:ffc0:4fff:2::1',
+    mac = '16:41:95:40:f7:dc',
+  },
+
+  fastd_mesh_vpn = {
+    methods = {'salsa2012+umac'},
+    mtu = 1280,
+    groups = {
+      backbone = {
+      limit = 1,
+        peers = {
+          gwu01 = {
+            key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b',
+            remotes = {
+              '"gwu01.ffmuc.net" port 10015',
+              '"gwu01.freifunk-muenchen.de" port 10015',
+            },
+          },
+          gwu02 = {
+            key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5',
+            remotes = {
+              '"gwu02.ffmuc.net" port 10015',
+              '"gwu02.freifunk-muenchen.de" port 10015',
+            },
+          },
+          gwu03 = {
+            key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522',
+            remotes = {
+              '"gwu03.ffmuc.net" port 10015',
+              '"gwu03.freifunk-muenchen.de" port 10015',
+            },
+          },
+          gwu04 = {
+            key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1',
+            remotes = {
+              '"gwu04.ffmuc.net" port 10015',
+              '"gwu04.freifunk-muenchen.de" port 10015',
+            },
+          },
+          gwu05 = {
+            key = 'b6de9fec8569b1fcdea8e7c45224ec30513d24e01af71148c6d640b5df471950',
+            remotes = {
+              '"gwu05.ffmuc.net" port 10015',
+              '"gwu05.freifunk-muenchen.de" port 10015',
+            },
+          },
+        },
+      },
+    },
+    bandwidth_limit = {
+      enabled = false,
+      egress = 1500,
+      ingress = 12000,
+    },
+  },
+
+  autoupdater = {
+    enabled = 1,
+    branch = 'stable',
+    branches = {
+      stable = {
+        name = 'stable',
+        mirrors = {
+          'http://firmware.ffmuc.net/stable/sysupgrade/',
+          'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/',
+        },
+        probability = 0.1,
+        good_signatures = 3,
+        pubkeys = {
+          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
+          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
+          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
+          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
+        },
+      },
+      experimental = {
+        name = 'experimental',
+        mirrors = {
+          'http://firmware.ffmuc.net/experimental/sysupgrade/',
+          'http://[fdef:ffc0:4fff::130]/experimental/sysupgrade/',
+        },
+        probability = 0.5,
+        good_signatures = 2,
+        pubkeys = {
+          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
+          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
+          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
+          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
+        },
+      },
+    },
+  },
+
+}
+-- vim: set ft=lua:ts=2:sw=2:et
--- a/extra/ffmuc_welcome.conf
+++ b/extra/ffmuc_welcome.conf
@@ -0,0 +1,147 @@
+{
+  hostname_prefix = 'welcome',
+  site_name = 'Freifunk München Welcome',
+  site_code = 'ffmuc_welcome',
+
+  opkg = {
+    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+  },
+
+  prefix4 = '10.80.64.0/19',
+  prefix6 = 'fdef:ffc0:4fff:1::/64',
+
+  timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
+  ntp_servers = { '0.ntp.ffmuc.net', '1.ntp.ffmuc.net' },
+
+  mesh_on_wan = false,
+
+  regdom = 'DE',
+
+  wifi24 = {
+    channel = 6,
+    ap = {
+      ssid = 'muenchen.freifunk.net',
+    },
+    --mesh = {
+    --  id = 'ffmuc-welcome-mesh',
+    --  mcast_rate = 12000,
+    --},
+    ibss = {
+      ssid = 'mesh.ffmuc.welcome',
+      bssid = '02:0E:8E:1E:61:18',
+      mcast_rate = 12000,
+    },
+  },
+
+  wifi5 = {
+    channel = 44,
+    ap = {
+      ssid = 'muenchen.freifunk.net',
+    },
+    --mesh = {
+    --  id = 'ffmuc-welcome-mesh',
+    --  mcast_rate = 12000,
+    --},
+    ibss = {
+      ssid = 'mesh.ffmuc.welcome',
+      bssid = '02:0E:8E:1E:61:18',
+      mcast_rate = 12000,
+    },
+  },
+
+  mesh = {
+    batman_adv = {
+      gw_sel_class = 3,
+    },
+  },
+
+  next_node = {
+    ip4 = '10.80.64.1',
+    ip6 = 'fdef:ffc0:4fff:1::1',
+    mac = '16:41:95:40:f7:dc',
+  },
+
+  fastd_mesh_vpn = {
+    methods = {'salsa2012+umac'},
+    mtu = 1280,
+    groups = {
+      backbone = {
+      limit = 1,
+        peers = {
+          gwf01 = {
+            key = '89951ed50d591c0a4682ae50cb38806efe44dd736ba91ef64c9ef06b20ec186e',
+            remotes = {
+              '"gwf01.ffmuc.net" port 11001',
+              '"gwf01.freifunk-muenchen.de" port 11001',
+            },
+          },
+          gwf02 = {
+            key = 'e255f2671c56f28a65173719be61939e5d48518eaa4da0d19283fd5395908e35',
+            remotes = {
+              '"gwf02.ffmuc.net" port 11001',
+              '"gwf02.freifunk-muenchen.de" port 11001',
+            },
+          },
+          gwf03 = {
+            key = 'bf16080ab05a4416285638208e6f17055ea8f92cfd496c61eee1f1160cf6d386',
+            remotes = {
+              '"gwf03.ffmuc.net" port 11001',
+              '"gwf03.freifunk-muenchen.de" port 11001',
+            },
+          },
+          gwf04 = {
+            key = '421a2c8e78f86d08fa7c8c7660b0dc073640ff365acb308ab92155c33488c539',
+            remotes = {
+              '"gwf04.ffmuc.net" port 11001',
+              '"gwf04.freifunk-muenchen.de" port 11001',
+            },
+          },
+        },
+      },
+    },
+    bandwidth_limit = {
+      enabled = false,
+      egress = 1500,
+      ingress = 12000,
+    },
+  },
+
+  autoupdater = {
+    enabled = 1,
+    branch = 'stable',
+    branches = {
+      stable = {
+        name = 'stable',
+        mirrors = {
+          'http://firmware.ffmuc.net/stable/sysupgrade/',
+          'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/',
+        },
+        probability = 0.1,
+        good_signatures = 3,
+        pubkeys = {
+          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
+          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
+          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
+          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
+        },
+      },
+      experimental = {
+        name = 'experimental',
+        mirrors = {
+          'http://firmware.ffmuc.net/experimental/sysupgrade/',
+          'http://[fdef:ffc0:4fff::130]/experimental/sysupgrade/',
+        },
+        probability = 0.5,
+        good_signatures = 2,
+        pubkeys = {
+          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
+          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
+          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
+          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
+        },
+      },
+    },
+  },
+
+}
+-- vim: set ft=lua:ts=2:sw=2:et
--- a/i18n/de.po
+++ b/i18n/de.po
@@ -18,15 +18,16 @@ msgstr ""

 msgid "gluon-config-mode:pubkey"
 msgstr ""
+" "

 msgid "gluon-config-mode:reboot"
 msgstr ""
 "<p>Dein Knoten startet gerade neu und wird anschließend versuchen, sich "
 "mit anderen Freifunk-Knoten in seiner Nähe zu verbinden. Weitere "
 "Informationen zur Münchner Freifunk-Community findest du auf "
-"<a href=\"http://freifunk-muenchen.de/\">unserer Webseite</a>. Wenn "
+"<a href=\"https://ffmuc.net/\">unserer Webseite</a>. Wenn "
 "alles geklappt hat, wirst du in ein paar Minuten unter "
-"<a href=\"http://map.freifunk-muenchen.de\">map.freifunk-muenchen.de</a> "
+"<a href=\"https://ffmuc.net/map/\">ffmuc.net/map/</a> "
 "deinen Knoten finden.</p> "
 "<p>Um zu dieser Konfigurationsseite zurückzugelangen, drücke im normalen "
 "Betrieb für drei Sekunden den Reset-Button. Das Gerät wird dann im Config "
--- a/i18n/en.po
+++ b/i18n/en.po
@@ -17,12 +17,13 @@ msgstr ""

 msgid "gluon-config-mode:pubkey"
 msgstr ""
+" "

 msgid "gluon-config-mode:reboot"
 msgstr ""
 "<p>Your node is currently rebooting and will try to connect to other "
 "nearby Freifunk nodes. It should appear on our map at "
-"<a href=\"http://map.freifunk-muenchen.de\">map.freifunk-muenchen.de</a> "
+"<a href=\"https://ffmuc.net/map/\">ffmuc.net/map/</a> "
 "in a few minutes.</p> "
 "<p>To get back to this configuration interface, press the reset button for "
 "3 seconds during normal operation. The device will then reboot into config "
--- a/7
+++ b/7
@@ -1,4 +1,5 @@
-GLUON_SITE_FEEDS='ffmuc_packages'
+GLUON_SITE_FEEDS='ffmuc'

-PACKAGES_FFMUC_PACKAGES_REPO=https://github.com/freifunkMUC/gluon-packages.git
-PACKAGES_FFMUC_PACKAGES_COMMIT=82e721ad5d7c9eca8728954cfa1ab1d5b9168487
+PACKAGES_FFMUC_REPO=https://github.com/freifunkMUC/gluon-packages.git
+PACKAGES_FFMUC_BRANCH=site-select-foo
+PACKAGES_FFMUC_COMMIT=c56b3ead02af64e46a22b3866a457ddd823eabf4
--- a/site.conf
+++ b/site.conf
@@ -2,9 +2,12 @@
  hostname_prefix = '',
  site_name = 'Freifunk München',
  site_code = 'ffmuc',
-  opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',

-  prefix4 = '10.80.0.0/16',
+  opkg = {
+    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+  },
+
+  prefix4 = '10.80.32.0/19',
  prefix6 = 'fdef:ffc0:4fff::/64',

  timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
@@ -15,95 +18,120 @@
  regdom = 'DE',

  wifi24 = {
-    ssid = 'muenchen.freifunk.net',
    channel = 6,
-    htmode = 'HT20',
-    mesh_ssid = 'mesh.ffmuc',
-    mesh_bssid = '02:0E:8E:1E:61:17',
-    mesh_mcast_rate = 12000,
+    ap = {
+      ssid = 'muenchen.freifunk.net',
+    },
+    --mesh = {
+    --  id = 'ffmuc-mesh',
+    --  mcast_rate = 12000,
+    --},
+    ibss = {
+      ssid = 'mesh.ffmuc',
+      bssid = '02:0E:8E:1E:61:17',
+      mcast_rate = 12000,
+    },
  },

  wifi5 = {
-    ssid = 'muenchen.freifunk.net',
    channel = 44,
-    htmode = 'HT40+',
-    mesh_ssid = 'mesh.ffmuc',
-    mesh_bssid = '02:0E:8E:1E:61:17',
-    mesh_mcast_rate = 12000,
+    ap = {
+      ssid = 'muenchen.freifunk.net',
+    },
+    --mesh = {
+    --  id = 'ffmuc-mesh',
+    --  mcast_rate = 12000,
+    --},
+    ibss = {
+      ssid = 'mesh.ffmuc',
+      bssid = '02:0E:8E:1E:61:17',
+      mcast_rate = 12000,
+    },
+  },
+
+  mesh = {
+    batman_adv = {
+      gw_sel_class = 3,
+    },
  },

  next_node = {
-    ip4 = '10.80.0.1',
+    ip4 = '10.80.32.1',
    ip6 = 'fdef:ffc0:4fff::1',
    mac = '16:41:95:40:f7:dc',
  },

  fastd_mesh_vpn = {
    methods = {'salsa2012+umac'},
-    mtu = 1426,
+    mtu = 1280,
    groups = {
      backbone = {
      limit = 1,
        peers = {
-          gw03 = {   --[[ fpletz ]]
+          gw03 = {
            key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
            remotes = {
-              'ipv4 "gw03.ffmuc.net" port 10000',
-              'ipv4 "gw03.freifunk-muenchen.de" port 10000',
+              '"gw03.ffmuc.net" port 10001',
+              '"gw03.freifunk-muenchen.de" port 10001',
            },
          },
          gw04 = {
            key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
            remotes = {
-              'ipv4 "gw04.ffmuc.net" port 10000',
-              'ipv4 "gw04.freifunk-muenchen.de" port 10000',
+              '"gw04.ffmuc.net" port 10001',
+              '"gw04.freifunk-muenchen.de" port 10001',
            },
          },
          gw05 = {
            key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
            remotes = {
-              'ipv4 "gw05.ffmuc.net" port 10000',
-              'ipv4 "gw05.freifunk-muenchen.de" port 10000',
+              '"gw05.ffmuc.net" port 10001',
+              '"gw05.freifunk-muenchen.de" port 10001',
            },
          },
          gw06 = {
            key = 'd6834aa47a14358d804139630812276b3297e767d159c9cfd13fa6fb638000e0',
            remotes = {
-              'ipv4 "gw06.ffmuc.net" port 10000',
-              'ipv4 "gw06.freifunk-muenchen.de" port 10000',
+              '"gw06.ffmuc.net" port 10001',
+              '"gw06.freifunk-muenchen.de" port 10001',
            },
          },
          gw07 = {
            key = '77b5f5189c360b245e1c934941468cc9cf57f0646465be5765593a95e54449d6',
            remotes = {
-              'ipv4 "gw07.ffmuc.net" port 10000',
-              'ipv4 "gw07.freifunk-muenchen.de" port 10000',
+              '"gw07.ffmuc.net" port 10001',
+              '"gw07.freifunk-muenchen.de" port 10001',
            },
          },
          gw08 = {
            key = 'e476fb3a72365b550a23b587c0962eed362ed0c237175552b3261d22daaa2055',
            remotes = {
-              'ipv4 "gw08.ffmuc.net" port 10000',
-              'ipv4 "gw08.freifunk-muenchen.de" port 10000',
+              '"gw08.ffmuc.net" port 10001',
+              '"gw08.freifunk-muenchen.de" port 10001',
            },
          },
          gw09 = {
            key = 'b86f436c9bb13b308dc92c3889fd468c46679d9df0bf4892244372ab415694d0',
            remotes = {
-              'ipv4 "gw09.ffmuc.net" port 10000',
-              'ipv4 "gw09.freifunk-muenchen.de" port 10000',
+              '"gw09.ffmuc.net" port 10001',
+              '"gw09.freifunk-muenchen.de" port 10001',
            },
          },
          gw10 = {
            key = 'c04358d4818ec108fa4715e4517300cb2d0fa848dfa872770c4b8487d525e8bf',
            remotes = {
-              'ipv4 "gw10.ffmuc.net" port 10000',
-              'ipv4 "gw10.freifunk-muenchen.de" port 10000',
+              '"gw10.ffmuc.net" port 10001',
+              '"gw10.freifunk-muenchen.de" port 10001',
            },
          },
        },
      },
    },
+    bandwidth_limit = {
+      enabled = false,
+      egress = 1500,
+      ingress = 12000,
+    },
  },

  autoupdater = {
@@ -117,7 +145,7 @@
          'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/',
        },
        probability = 0.1,
-        good_signatures = 2,
+        good_signatures = 3,
        pubkeys = {
          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
@@ -132,21 +160,16 @@
          'http://[fdef:ffc0:4fff::130]/experimental/sysupgrade/',
        },
        probability = 0.5,
-        good_signatures = 1,
+        good_signatures = 2,
        pubkeys = {
+          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
+          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
+          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
        },
      },
    },
  },

-  simple_tc = {
-    mesh_vpn = {
-      ifname = 'mesh-vpn',
-      enabled = false,
-      limit_egress = 1200,
-      limit_ingress = 12000,
-    },
-  },
 }
 -- vim: set ft=lua:ts=2:sw=2:et
--- a/site.mk
+++ b/site.mk
@@ -1,7 +1,7 @@
 GLUON_SITE_PACKAGES := \
 	gluon-mesh-batman-adv-15 \
 	gluon-alfred \
-	gluon-announced \
+	gluon-respondd \
 	gluon-autoupdater \
 	gluon-config-mode-core \
 	gluon-config-mode-autoupdater \
@@ -9,6 +9,7 @@ GLUON_SITE_PACKAGES := \
 	gluon-config-mode-mesh-vpn \
 	gluon-config-mode-geo-location \
 	gluon-config-mode-contact-info \
+	gluon-config-mode-site-select \
 	gluon-ebtables-filter-multicast \
 	gluon-ebtables-filter-ra-dhcp \
 	gluon-luci-admin \
@@ -25,7 +26,146 @@ 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
+
+# basic support for USB stack
+USB_PACKAGES_BASIC := \
+	kmod-usb-core \
+	kmod-usb2
+
+# storage support for USB devices
+USB_PACKAGES_STORAGE := \
+	block-mount \
+	blkid \
+	kmod-fs-ext4 \
+	kmod-fs-vfat \
+	kmod-usb-storage \
+	kmod-usb-storage-extras \
+	kmod-nls-cp1250 \
+	kmod-nls-cp1251 \
+	kmod-nls-cp437 \
+	kmod-nls-cp775 \
+	kmod-nls-cp850 \
+	kmod-nls-cp852 \
+	kmod-nls-cp866 \
+	kmod-nls-iso8859-1 \
+	kmod-nls-iso8859-13 \
+	kmod-nls-iso8859-15 \
+	kmod-nls-iso8859-2 \
+	kmod-nls-koi8r \
+	kmod-nls-utf8 \
+	swap-utils
+
+# network support for USB devices
+USB_PACKAGES_NET := \
+	kmod-mii \
+	kmod-nls-base \
+	kmod-usb-net \
+	kmod-usb-net-asix \
+	kmod-usb-net-asix-ax88179 \
+	kmod-usb-net-cdc-eem \
+	kmod-usb-net-cdc-ether \
+	kmod-usb-net-cdc-mbim \
+	kmod-usb-net-cdc-ncm \
+	kmod-usb-net-cdc-subset \
+	kmod-usb-net-dm9601-ether \
+	kmod-usb-net-hso \
+	kmod-usb-net-huawei-cdc-ncm \
+	kmod-usb-net-ipheth \
+	kmod-usb-net-kalmia \
+	kmod-usb-net-kaweth \
+	kmod-usb-net-mcs7830 \
+	kmod-usb-net-pegasus \
+	kmod-usb-net-qmi-wwan \
+	kmod-usb-net-rndis \
+	kmod-usb-net-sierrawireless \
+	kmod-usb-net-smsc95xx
+# broken
+#	kmod-usb-net-rtl8150 \
+#	kmod-usb-net-rtl8152 \
+
+# network support for PCI devices
+PCI_PACKAGES_NET := \
+	kmod-3c59x \
+	kmod-e100 \
+	kmod-e1000 \
+	kmod-e1000e \
+	kmod-forcedeth \
+	kmod-natsemi \
+	kmod-ne2k-pci \
+	kmod-pcnet32 \
+	kmod-r8169 \
+	kmod-sis900 \
+	kmod-sky2 \
+	kmod-tg3 \
+	kmod-tulip \
+	kmod-via-rhine
+# broken
+#	kmod-ixgbe \
+#	kmod-r8139too \
+
+# additional packages
+TOOLS_PACKAGES := \
+	iperf \
+	socat \
+	tcpdump \
+	usbutils \
+	vnstat
+# broken
+#	pciutils \
+
+#
+# $(GLUON_TARGET) specific settings:
+#
+
+# x86-generic
+ifeq ($(GLUON_TARGET),x86-generic)
+# support the usb stack on x86 devices
+# and add a few common USB and PCI NICs
+GLUON_SITE_PACKAGES += \
+	kmod-usb-hid \
+	kmod-hid-generic \
+	$(USB_PACKAGES_BASIC) \
+	$(USB_PACKAGES_STORAGE) \
+	$(USB_PACKAGES_NET) \
+	$(PCI_PACKAGES_NET) \
+	$(TOOLS_PACKAGES)
+endif
+
+# x86-64
+ifeq ($(GLUON_TARGET),x86-64)
+# support the usb stack on x86-64 devices
+# and add a few common USB and PCI NICs
+GLUON_SITE_PACKAGES += \
+	kmod-usb-hid \
+	kmod-hid-generic \
+	$(USB_PACKAGES_BASIC) \
+	$(USB_PACKAGES_STORAGE) \
+	$(USB_PACKAGES_NET) \
+	$(PCI_PACKAGES_NET) \
+	$(TOOLS_PACKAGES)
+endif
+
+ifeq ($(GLUON_TARGET),x86-kvm_guest)
+GLUON_SITE_PACKAGES += \
+	$(TOOLS_PACKAGES)
+endif
+
+# ar71xx-generic
+GLUON_TLWR842_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
+GLUON_TLWR1043_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
+GLUON_TLWR2543_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
+GLUON_TLWDR4300_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
+GLUON_WNDR3700_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
+GLUON_WRT160NL_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
+GLUON_ARCHERC7_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
+GLUON_GLINET_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
+GLUON_WZRHPG450H_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
+GLUON_WZRHPAG300H_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
+
+# mpc85xx-generic
+GLUON_TLWDR4900_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)


 DEFAULT_GLUON_RELEASE := snapshot~$(shell date '+%Y%m%d')
Author	SHA1	Message	Date
Franz Pletz	479d268445	foo	2016-07-28 00:55:01 +02:00
Franz Pletz	4696b34bcc	add some more fixes from upstream gluon	2016-07-25 20:02:56 +02:00
chris	9a918325ec	added fix for autoupdater from gluon upstream	2016-07-22 17:15:44 +02:00
chris	ab22e2d78c	added tecff-ath9k-broken-wifi-workaround gluon package	2016-07-13 22:03:15 +02:00
Franz Pletz	f36fbda561	Swtich fastd port for 1280 mtu in umland to 10015 There was a clash with port 10011 because it is already assigned on old firmware versions to gwu02.	2016-06-26 14:19:56 +02:00
Christian Obersteiner	722c241634	updated to latest version of ffmuc gluon fork (jessie buildfix)	2016-06-13 18:42:39 +02:00
Christian Obersteiner	a0dd9af8cb	upgraded to gluon v2016.1.5 (on ffmuc fork)	2016-05-28 20:23:13 +02:00
Christian Obersteiner	290a5b667e	fixing support of v11 in ffmuc gluon fork	2016-05-02 22:06:02 +02:00
Christian Obersteiner	b3486ac887	added support for TL-WR841N/ND v11	2016-05-02 19:38:55 +02:00
chris007de	514968add6	Added Stages to Jenkinsfile	2016-04-29 15:38:56 +02:00
chris007de	d4b8a569f9	Create Jenkinsfile	2016-04-28 22:59:59 +02:00
Christian Obersteiner	0f716a31fa	upgraded to gluon v2016.1.4 (on ffmuc fork)	2016-04-27 20:13:09 +02:00
Christian Obersteiner	0122f6b7e9	upgraded to gluon v2016.1.3 (on ffmuc fork)	2016-04-21 18:27:21 +02:00
Christian Obersteiner	edf0ad6c7d	updated changelog to v2016.1.2	2016-03-10 23:33:40 +01:00
Christian Obersteiner	846ccd159a	updating to ffmuc fork of gluon v2016.1.2	2016-03-10 23:32:08 +01:00
Christian Obersteiner	ba8617805b	added info about v2016.1.1-tecff	2016-03-03 07:57:31 +01:00
Christian Obersteiner	a43c203cc6	switching to tecff fork of gluon with 2016.1.1 + mesh_no_rebroadcast + futro support + preserve wifi channels	2016-03-03 07:53:54 +01:00
Christian Obersteiner	98d80678a8	added info about 2016.1.1	2016-03-02 21:30:30 +01:00
Christian Obersteiner	647c745478	update to gluon v2016.1.1	2016-03-02 21:28:26 +01:00
Christian Obersteiner	b4a1661f76	add x86-64 build target	2016-02-29 17:55:45 +01:00
Christian Obersteiner	0ee11b42de	Update to current gluon master	2016-02-29 17:53:51 +01:00
chris007de	2a8503953d	Update CHANGELOG.md	2016-02-25 12:41:34 +01:00
Christian Obersteiner	5dfbe2ac8e	switching to gluon ffmuc fork for 2016.1+extras	2016-02-23 08:08:04 +01:00
Christian Obersteiner	19ebf58105	added "output" dir to gitignore	2016-02-23 08:07:52 +01:00
Franz Pletz	fa03eb9e60	Add some extra packages on devices with sufficient storage Based on https://github.com/tecff/site-ffa/.	2016-02-22 04:47:16 +01:00
Franz Pletz	51b4e5c9a1	The future is now: Disable IPv4-only fastd	2016-02-16 15:21:34 +01:00
Franz Pletz	41f559ea97	Change MTU to 1280 and increase port by 1	2016-02-16 15:20:03 +01:00
Christian Obersteiner	b6ec692ef9	update ffmuc packages repo (again)	2016-02-11 08:14:15 +01:00
Franz Pletz	a78255bde9	update ffmuc gluon packages repo	2016-02-11 01:03:46 +01:00
Franz Pletz	f855fed132	Merge pull request #31 from rotanid/patch-1 use correct branch for 2016.1 changes	2016-02-11 00:43:26 +01:00
Franz Pletz	c59780e02e	Merge pull request #32 from rotanid/patch-2 update link to gluon documentation v2016.1	2016-02-11 00:43:10 +01:00
Andreas Ziegler	8d0b80c40b	update link to gluon documentation v2016.1	2016-02-11 00:39:58 +01:00
Andreas Ziegler	6429df242c	use correct branch for 2016.1 changes and drop obsolete string	2016-02-11 00:35:57 +01:00
Christian Obersteiner	f08c5759dc	Using fixed ffmuc site-select package for 2016.1 (.json instead of .conf files)	2016-02-10 21:47:00 +01:00
Christian Obersteiner	4c2c01c081	Changing from gluon-announced to gluon-respondd as desired by gluon 2016.1	2016-02-10 21:46:14 +01:00
Franz Pletz	ec4161eabb	Update gluon to v2016.1	2016-02-08 15:35:02 +01:00
Franz Pletz	1b5480c429	Update to current gluon master	2015-12-15 13:47:42 +01:00
Franz Pletz	285bc29578	Merge pull request #30 from rotanid/master_2 always hide the fastd key in wizard, fixes #16	2015-12-09 12:25:39 +01:00
Franz Pletz	567833f0f4	Merge pull request #29 from rotanid/master_1 update link to gluon documentation	2015-12-09 12:25:35 +01:00
Andreas Ziegler	961c61780c	always hide the fastd key in wizard, fixes #16	2015-12-09 12:13:09 +01:00
Andreas Ziegler	fd736ea6be	update link to gluon documentation	2015-12-09 12:11:28 +01:00
Franz Pletz	c3a4059acd	Switch back to upstream gluon (all patches merged)	2015-11-26 18:35:38 +01:00
Franz Pletz	8d758cc90c	Update to current gluon master	2015-11-26 18:29:39 +01:00
Franz Pletz	0f02267de7	Switch to our gluon fork (fix mesh disabled upgrades)	2015-11-19 00:42:24 +01:00
Franz Pletz	d0d2aeaea1	Update to current gluon master	2015-11-18 19:26:41 +01:00
Franz Pletz	4295ef317b	Update opkg repo config syntax	2015-11-06 03:50:33 +01:00
Franz Pletz	73af020e8f	Update bandwidth limit config syntax	2015-11-06 03:42:10 +01:00
Franz Pletz	3388a7cad5	Remove htmode option, dropped by gluon	2015-11-06 01:04:54 +01:00
Franz Pletz	a49fb7c65c	Update site.conf of all segments	2015-11-06 00:59:55 +01:00
Franz Pletz	5c17173bf4	Disable 802.11s mesh, saves wifi bandwidth	2015-11-06 00:53:25 +01:00
Franz Pletz	070612c696	Merge branch 'experimental'	2015-11-06 00:50:37 +01:00
Franz Pletz	d116887d1a	Images are now placed in output/images	2015-11-05 01:50:07 +01:00
Franz Pletz	a8d7aca312	Update to current gluon master	2015-11-05 01:46:37 +01:00
Franz Pletz	af8a3efe88	Update to current gluon master	2015-11-04 23:49:49 +01:00
Franz Pletz	387d1b994b	Update to upstream gluon repo	2015-10-28 22:52:58 +01:00
Franz Pletz	6cbc4393e1	Update to current gluon master	2015-10-28 22:49:15 +01:00
Franz Pletz	2e193ce6ef	Raise needed stable signatures to 3 for all segments	2015-10-24 03:55:59 +02:00
Franz Pletz	e06f22bf47	Merge branch 'master' into stable	2015-10-24 03:53:37 +02:00
Franz Pletz	58e5876099	Release 2015.7	2015-10-24 03:53:08 +02:00
Franz Pletz	9ce45ff470	Release 2015.6.2	2015-10-24 03:51:24 +02:00
Franz Pletz	1e49768ce6	Update to current gluon master	2015-10-17 16:13:10 +02:00
Christian Obersteiner	ac8de1623d	Revert "added support for 841 v10" This reverts commit `d827615aa3`.	2015-10-17 11:39:08 +02:00
Christian Obersteiner	d827615aa3	added support for 841 v10	2015-10-17 11:31:49 +02:00
Franz Pletz	b3babe75d6	Update to current gluon master	2015-10-16 01:50:32 +02:00
Franz Pletz	029b1e2123	Switch autoupdater URL back to main firmware repo path	2015-10-14 23:39:33 +02:00
Franz Pletz	b3dc38716c	Set batman gw selection class to 3 (fast switch)	2015-10-14 21:30:02 +02:00
Franz Pletz	9dacd3de94	Update to current gluon master	2015-10-14 21:27:24 +02:00
chris007de	0c6ca4ae44	experimental: 2 signatures see https://lqfb.freifunk-muenchen.de/lf/issue/show/77.html	2015-10-12 15:43:39 +02:00
chris007de	7917b76947	Changing required number of signatures to 3 for stable and ext Um das bereits lang angedachte (und schon ewig kommunizierte) >4 Augen Prinzip bei FW Releases einzufuehren, wird die Anzahl der benoetigten Signaturen hochgesetzt. Dies ist auch bei Experimental Images der Fall, da Images die ueber Experimental Autoupdater ins Produktivnetz ausgerollt werden, bereits vorher in einem autarken Testbed getestet worden sein sollen.	2015-10-12 15:43:39 +02:00
Franz Pletz	5f53ae04fc	Update gluon	2015-10-12 15:38:23 +02:00
Christian Obersteiner	7f3333a684	using our own gluon-config-site-select module	2015-10-11 15:17:53 +02:00
Franz Pletz	f05c290a11	Revert gluon update	2015-10-11 11:37:12 +02:00
Franz Pletz	ae221b6325	Update gluon	2015-10-11 10:46:11 +02:00
Franz Pletz	08f3a2abfd	Update gluon to fix empty function announce entries	2015-10-11 10:35:20 +02:00
Franz Pletz	248c564356	Revert "Merge pull request #17 from freifunkMUC/chris007de-patch-1" This reverts commit `5e3024a061`, reversing changes made to `4d1fdf95a7`.	2015-10-09 05:46:54 +02:00
midzer	5e3024a061	Merge pull request #17 from freifunkMUC/chris007de-patch-1 Changing required number of signatures to 3 for stable and 2 for exp	2015-10-09 01:39:06 +02:00
Franz Pletz	7f2e8f369f	Don't clean gluon-build dir by default	2015-10-06 11:55:29 +02:00
Franz Pletz	d6dfa0e9fd	Revert "removing multiple jobs from makefile (again), as it is obviously still broken" This reverts commit `3ea1990a14`.	2015-10-06 11:53:54 +02:00
Franz Pletz	52b4bc4289	Switch MTU back to 1426	2015-10-06 11:49:21 +02:00
Franz Pletz	9590d9636e	Switch to our gluon fork with new status-page	2015-10-06 11:32:02 +02:00
Franz Pletz	4d1fdf95a7	Remove extra site symlink	2015-10-05 12:35:44 +02:00
Franz Pletz	b47a2f68ec	site.conf: 802.11s support & new wifi config format	2015-10-05 11:55:33 +02:00
Franz Pletz	dda8b5b8dc	Revert "Update site.conf & switch to mesh testing config" This reverts commit `2cc57e495e`.	2015-10-05 11:52:22 +02:00
Franz Pletz	52ae9f407b	Update to current gluon master	2015-10-04 22:48:00 +02:00
Franz Pletz	4728e2d664	Add ffmuc_welcome site.conf	2015-10-04 15:29:59 +02:00
Franz Pletz	c1b7beaebb	Don't overwrite GLUON_SITE_FEEDS in modules	2015-10-04 14:04:59 +02:00
Franz Pletz	11e58e4d0c	Reenable ebtables filters	2015-10-04 13:10:15 +02:00
Franz Pletz	575c48c284	Try symlinking extra/ffmuc.conf to site.conf	2015-10-04 11:24:13 +02:00
chris007de	c4652bc691	experimental: 2 signatures see https://lqfb.freifunk-muenchen.de/lf/issue/show/77.html	2015-09-30 18:32:23 +02:00
Christian Obersteiner	48c96b7ed4	Softlinking site.conf to the default .conf does not work	2015-09-28 21:38:47 +02:00
Christian Obersteiner	4d9c61e8d1	Integration of the gluon-config-site-select package LUA does not like '-', so ffmuc-umland was renamed to ffmuc_umland Several testing has still to be done (especially upgrade to/from a firmware with site-select)	2015-09-28 20:57:34 +02:00
Franz Pletz	4f09c8c05d	Merge pull request #23 from x29a/newurl update url to webpage and meshviewer/map	2015-09-27 16:56:53 +02:00
x29a	0b5aeca9b8	update url to webpage and meshviewer/map	2015-09-27 16:53:00 +02:00
Franz Pletz	ce57afabe0	Fix prefix4 & next_node.ip4, fixes #19	2015-09-26 20:13:02 +02:00
Franz Pletz	77bd955825	Update to current gluon master	2015-09-19 20:58:19 +02:00
Franz Pletz	b5c478230e	Require 2 signatures for experimental (LQFB i139)	2015-09-19 20:46:02 +02:00
Franz Pletz	0e421661c0	Remove fastd gateways peers with alternate ports	2015-09-19 01:10:33 +02:00
Franz Pletz	9a9c8b3162	Update gluon	2015-09-10 21:40:52 +02:00
Franz Pletz	b6763ddfe1	Update gluon	2015-09-09 22:34:43 +02:00
chris007de	14d3893226	Changing required number of signatures to 3 for stable and ext Um das bereits lang angedachte (und schon ewig kommunizierte) >4 Augen Prinzip bei FW Releases einzufuehren, wird die Anzahl der benoetigten Signaturen hochgesetzt. Dies ist auch bei Experimental Images der Fall, da Images die ueber Experimental Autoupdater ins Produktivnetz ausgerollt werden, bereits vorher in einem autarken Testbed getestet worden sein sollen.	2015-09-09 10:05:18 +02:00
Franz Pletz	ea3ae61a74	Real peers needed for random port selection instead of remotes	2015-09-07 22:43:37 +02:00
Franz Pletz	df2df80439	Add fastd port 10002 for gw03 & gw04	2015-09-07 19:59:45 +02:00
Franz Pletz	aa20154294	Revert "Decrease fastd mtu to 1280 & use port 10001" This reverts commit `11059b8851`.	2015-09-06 18:46:14 +02:00
Franz Pletz	469b08b665	Revert "Due to mtu change, we now support ipv6 fastd connections" This reverts commit `a9baeb4dbb`.	2015-09-06 18:46:10 +02:00
Franz Pletz	1a08076197	Update gluon to our own fork	2015-09-06 02:04:39 +02:00
Franz Pletz	a9baeb4dbb	Due to mtu change, we now support ipv6 fastd connections	2015-09-06 00:59:22 +02:00
Franz Pletz	eb6a462b80	Makefile: Fix typo	2015-09-05 20:16:49 +02:00
Franz Pletz	9f56af29e9	Add default building for architecture mpc85xx-generic	2015-09-05 20:11:48 +02:00
Franz Pletz	192c43f69b	Revert "Makefile: Remove JOBS option" This reverts commit `176d7e01e0`.	2015-09-05 20:05:20 +02:00
Christian Obersteiner	c8515daac8	checking if the status-page branch is broken by building currently latest master	2015-09-04 17:00:03 +02:00
Christian Obersteiner	a9e8748f14	put gluon-clean into gluon-prepare	2015-09-02 22:49:03 +02:00
Christian Obersteiner	7e1e72593f	grml spaces to tab	2015-09-02 22:43:12 +02:00
Christian Obersteiner	54c7ee4053	added clean to target build	2015-09-02 22:41:04 +02:00
Christian Obersteiner	0caf270234	Choosing current head of our own gluon repo (with currently latest status-page branch from original gluon repo)	2015-09-02 21:54:31 +02:00
Christian Obersteiner	3ea1990a14	removing multiple jobs from makefile (again), as it is obviously still broken	2015-09-02 21:43:03 +02:00
Franz Pletz	0d7507ab6d	Update to ffmuc gluon fork (master + status-page)	2015-08-29 16:38:55 +02:00
Franz Pletz	7ff33f3d44	Update to current gluon master	2015-08-29 01:54:58 +02:00
Franz Pletz	4fd79b52ff	Update to gluon master	2015-08-22 23:25:28 +02:00
Franz Pletz	2973750275	Revert "Enable babel meshing, disable batman" This reverts commit `c3fa483996`.	2015-08-22 23:24:28 +02:00
Franz Pletz	f7ef41a3eb	Revert "Makefile: Remove JOBS option" This reverts commit `176d7e01e0`.	2015-08-22 23:22:56 +02:00
Franz Pletz	c3fa483996	Enable babel meshing, disable batman	2015-08-22 15:43:46 +02:00
Franz Pletz	2cc57e495e	Update site.conf & switch to mesh testing config	2015-08-22 15:38:43 +02:00
Franz Pletz	51d3e91e45	Update to gluon babel branch	2015-08-22 15:38:30 +02:00
Franz Pletz	11059b8851	Decrease fastd mtu to 1280 & use port 10001	2015-08-19 20:29:30 +02:00
Franz Pletz	73fa45d03f	Update changelog for v2015.6	2015-08-19 18:09:35 +02:00
Franz Pletz	a8d0a310df	Merge branch 'stable'	2015-08-19 18:07:23 +02:00
Christian Obersteiner	68e7a2e7ac	bumped to v2015.1.2	2015-08-10 21:22:45 +02:00
Franz Pletz	17105d054d	Build gluon target x86-generic by default	2015-06-19 23:42:49 +02:00