Images are now placed in output/images

Update to current gluon master
2015-11-05 01:50:07 +01:00 · 2015-11-05 01:46:37 +01:00 · 2015-10-17 16:13:10 +02:00 · 2015-10-16 01:50:32 +02:00 · 2015-10-14 21:30:02 +02:00 · 2015-10-14 21:27:24 +02:00
5 changed files with 79 additions and 78 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,8 @@
 # Freifunk München Firmware Changelog

-## v2015.5-altdorf
- - Added additional Autoupdate Server for altdorf
- - Added additional Autoupdate Signatures for altdorf
- - Made changes necessary for Altdorf in i18n folder
+## 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
@@ -46,10 +45,6 @@
 - Use internal NTP server 0.ntp.ffmuc.net
 - Connections from nodes to gateways only over IPv4 for now (MTU issues)

-## v2015.1-altdorf
- - Changed SSID to altdorf.freifunk.net
- - Changed Autoupdater URLs for altdorf firmware
-
 ## v2015.1
 - Updated to Gluon 2014.4 release
 - Autoupdater
--- a/19
+++ b/19
@@ -1,12 +1,13 @@
 GLUON_BUILD_DIR := gluon-build
 GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
-GLUON_GIT_REF := v2015.1.1
+GLUON_GIT_REF := 72e554fcff0c9f67c62630a41557eac30fa480a8

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

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

 GLUON_RELEASE := $(shell git describe --tags 2>/dev/null)
@@ -16,7 +17,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}

@@ -38,15 +41,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 +60,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/i18n/de.po
+++ b/i18n/de.po
@@ -12,38 +12,30 @@ msgstr ""

 msgid "gluon-config-mode:welcome"
 msgstr ""
-"Willkommen zum Einrichtungsassistenten für deinen neuen Altdorfer "
+"Willkommen zum Einrichtungsassistenten für deinen neuen Münchner "
 "Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen "
 "entsprechend aus und sende es ab."

 msgid "gluon-config-mode:pubkey"
 msgstr ""
-"Dies ist der öffentliche Schlüssel deines Freifunk-Knotens. Der Schlüssel "
-"wird automatisch auf den Servern des Freifunk Altdorf eingetragen "
-"sobald eine Internetverbindung hergestellt wurde."
-"Mit diesem Schlüssel kann sich dein Knoten mit dem Altdorfer Mesh-VPN verbinden. "

 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 Altdorfer Freifunk-Community findest du auf "
-"<a href=\"http://www.freifunk-altdorf.de/\">unserer Webseite</a>. Wenn "
+"Informationen zur Münchner Freifunk-Community findest du auf "
+"<a href=\"http://freifunk-muenchen.de/\">unserer Webseite</a>. Wenn "
 "alles geklappt hat, wirst du in ein paar Minuten unter "
-"<a href=\"http://map.freifunk-altdorf.de\">map.freifunk-altdorf.de</a> "
+"<a href=\"http://map.freifunk-muenchen.de\">map.freifunk-muenchen.de</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 "
 "Mode neustarten.</p>"
-"<p>Wenn Du mehr über Freifunk in Altdorf erfahren möchtest, dann besuche "
-"uns doch auf unserem Treffen (siehe Webseite). "
+"<p>Wenn Du mehr über Freifunk in München erfahren möchtest, dann besuche "
+"uns doch auf unserem monatlichen Treffen (siehe Webseite). Um mehr "
+"auf die Entwicklung zu nehmen, hast Du als Knotenbetreiber "
+"zusätzlich die Möglichkeit in unserem "
+"<a href=\"https://lqfb.freifunk-muenchen.de\">Abstimmungs- und Dokumentationssystem</a> "
+"mitzumachen. Voraussetzung ist eine persönliche Anmeldung auf einem "
+"der Treffen.</p> "
 "<p>Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!</p>"
-"Melde Dich bitte unbedingt noch bei unserer Mailingliste an! "
-"<a href=\"http://freifunk-altdorf.de/verein/mailingliste.php\">altdorf@freifunk.net</a> "
-"Damit informieren wir Dich wenn es unvorhergesehen Störungen im Freifunk- Netz "
-"geben sollte oder falls Dein Router einen neue Firmware benötigt, "
-"die nicht über ein automatisches Update aufgespielt werden kann. "
-"Bestenfalls einmal im Monat weisen wir auf Zeit und Ort unseres nächsten Treffen hin. "
-"Keine Angst wir versenden garantiert keine Spam-Mails und geben Deine "
-"Mailadresse garantiert nicht weiter.</p> "
-"Dein Freifunk Team Altdorf "
--- a/i18n/en.po
+++ b/i18n/en.po
@@ -12,7 +12,7 @@ msgstr ""

 msgid "gluon-config-mode:welcome"
 msgstr ""
-"Welcome the the setup wizard of your new Freifunk Altdorf node. "
+"Welcome the the setup wizard of your new Freifunk Munich node. "
 "Please fill out the following form and transmit it."

 msgid "gluon-config-mode:pubkey"
@@ -22,7 +22,7 @@ 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-altdorf.de.de\">map.freifunk-altdorf.de</a> "
+"<a href=\"http://map.freifunk-muenchen.de\">map.freifunk-muenchen.de</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/site.conf
+++ b/site.conf
@@ -1,6 +1,6 @@
 {
  hostname_prefix = '',
-  site_name = 'Freifunk Altdorf',
+  site_name = 'Freifunk München',
  site_code = 'ffmuc',
  opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',

@@ -15,21 +15,43 @@
  regdom = 'DE',

  wifi24 = {
-    ssid = 'altdorf.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 = 'altdorf.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 = {
@@ -48,57 +70,57 @@
          gw03 = {   --[[ fpletz ]]
            key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
            remotes = {
-              'ipv4 "gw03.ffmuc.net" port 10000',
-              'ipv4 "gw03.freifunk-muenchen.de" port 10000',
+              'ipv4 "gw03.ffmuc.net" port 10001',
+              'ipv4 "gw03.freifunk-muenchen.de" port 10001',
            },
          },
          gw04 = {
            key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
            remotes = {
-              'ipv4 "gw04.ffmuc.net" port 10000',
-              'ipv4 "gw04.freifunk-muenchen.de" port 10000',
+              'ipv4 "gw04.ffmuc.net" port 10001',
+              'ipv4 "gw04.freifunk-muenchen.de" port 10001',
            },
          },
          gw05 = {
            key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
            remotes = {
-              'ipv4 "gw05.ffmuc.net" port 10000',
-              'ipv4 "gw05.freifunk-muenchen.de" port 10000',
+              'ipv4 "gw05.ffmuc.net" port 10001',
+              'ipv4 "gw05.freifunk-muenchen.de" port 10001',
            },
          },
          gw06 = {
            key = 'd6834aa47a14358d804139630812276b3297e767d159c9cfd13fa6fb638000e0',
            remotes = {
-              'ipv4 "gw06.ffmuc.net" port 10000',
-              'ipv4 "gw06.freifunk-muenchen.de" port 10000',
+              'ipv4 "gw06.ffmuc.net" port 10001',
+              'ipv4 "gw06.freifunk-muenchen.de" port 10001',
            },
          },
          gw07 = {
            key = '77b5f5189c360b245e1c934941468cc9cf57f0646465be5765593a95e54449d6',
            remotes = {
-              'ipv4 "gw07.ffmuc.net" port 10000',
-              'ipv4 "gw07.freifunk-muenchen.de" port 10000',
+              'ipv4 "gw07.ffmuc.net" port 10001',
+              'ipv4 "gw07.freifunk-muenchen.de" port 10001',
            },
          },
          gw08 = {
            key = 'e476fb3a72365b550a23b587c0962eed362ed0c237175552b3261d22daaa2055',
            remotes = {
-              'ipv4 "gw08.ffmuc.net" port 10000',
-              'ipv4 "gw08.freifunk-muenchen.de" port 10000',
+              'ipv4 "gw08.ffmuc.net" port 10001',
+              'ipv4 "gw08.freifunk-muenchen.de" port 10001',
            },
          },
          gw09 = {
            key = 'b86f436c9bb13b308dc92c3889fd468c46679d9df0bf4892244372ab415694d0',
            remotes = {
-              'ipv4 "gw09.ffmuc.net" port 10000',
-              'ipv4 "gw09.freifunk-muenchen.de" port 10000',
+              'ipv4 "gw09.ffmuc.net" port 10001',
+              'ipv4 "gw09.freifunk-muenchen.de" port 10001',
            },
          },
          gw10 = {
            key = 'c04358d4818ec108fa4715e4517300cb2d0fa848dfa872770c4b8487d525e8bf',
            remotes = {
-              'ipv4 "gw10.ffmuc.net" port 10000',
-              'ipv4 "gw10.freifunk-muenchen.de" port 10000',
+              'ipv4 "gw10.ffmuc.net" port 10001',
+              'ipv4 "gw10.freifunk-muenchen.de" port 10001',
            },
          },
        },
@@ -113,17 +135,12 @@
      stable = {
        name = 'stable',
        mirrors = {
-          'http://fw1.tecff.de/altdorf/stable/sysupgrade/',
-	  'http://fw2.tecff.de/altdorf/stable/sysupgrade/',
-          'http://firmware.ffmuc.net/altdorf/stable/sysupgrade/',
-          'http://[fdef:ffc0:4fff::130]/altdorf/stable/sysupgrade/',
+          'http://firmware.ffmuc.net/stable/sysupgrade/',
+          'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/',
        },
        probability = 0.1,
        good_signatures = 2,
        pubkeys = {
-          
-          'a9ba1d78b5d48d1539c5c6824ca62d8c7ce7a79913d2f3fcf28e4f7fe4e777a8', -- walter hartl
-          'ed09d23552225f71da8a3763b17a09eb8e126ad3c4938275bd51d6d564e0ac0b', -- walter henz
          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
@@ -133,17 +150,12 @@
      experimental = {
        name = 'experimental',
        mirrors = {
-          'http://fw1.tecff.de/altdorf/experimental/sysupgrade/',
-	  'http://fw2.tecff.de/altdorf/experimental/sysupgrade/',
-          'http://firmware.ffmuc.net/altdorf/experimental/sysupgrade/',
-          'http://[fdef:ffc0:4fff::130]/altdorf/experimental/sysupgrade/',
+          'http://firmware.ffmuc.net/experimental/sysupgrade/',
+          'http://[fdef:ffc0:4fff::130]/experimental/sysupgrade/',
        },
        probability = 0.5,
        good_signatures = 1,
        pubkeys = {
-
-         'a9ba1d78b5d48d1539c5c6824ca62d8c7ce7a79913d2f3fcf28e4f7fe4e777a8', -- walter hartl
-         'ed09d23552225f71da8a3763b17a09eb8e126ad3c4938275bd51d6d564e0ac0b', -- walter henz
          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
        },
      },
@@ -160,4 +172,3 @@
  },
 }
 -- vim: set ft=lua:ts=2:sw=2:et
-
Author	SHA1	Message	Date
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	1e49768ce6	Update to current gluon master	2015-10-17 16:13:10 +02:00
Franz Pletz	b3babe75d6	Update to current gluon master	2015-10-16 01:50:32 +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
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	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	77bd955825	Update to current gluon master	2015-09-19 20:58:19 +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