Images are now placed in output/images

This reverts commit 3ea1990a14.

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Freifunk München Firmware Changelog
 
+## 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

Makefile

@@ -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:
+output-clean:
-	rm -rf images
+	rm -rf output
 
-clean: gluon-clean images-clean
+clean: gluon-clean output-clean

site.conf

@@ -15,21 +15,43 @@
   regdom = 'DE',
 
   wifi24 = {
-    ssid = 'muenchen.freifunk.net',
     channel = 6,
     htmode = 'HT20',
-    mesh_ssid = 'mesh.ffmuc',
+    ap = {
-    mesh_bssid = '02:0E:8E:1E:61:17',
+      ssid = 'muenchen.freifunk.net',
-    mesh_mcast_rate = 12000,
+    },
+    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',
+    ap = {
-    mesh_bssid = '02:0E:8E:1E:61:17',
+      ssid = 'muenchen.freifunk.net',
-    mesh_mcast_rate = 12000,
+    },
+    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.ffmuc.net" port 10001',
-              'ipv4 "gw03.freifunk-muenchen.de" port 10000',
+              'ipv4 "gw03.freifunk-muenchen.de" port 10001',
             },
           },
           gw04 = {
             key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
             remotes = {
-              'ipv4 "gw04.ffmuc.net" port 10000',
+              'ipv4 "gw04.ffmuc.net" port 10001',
-              'ipv4 "gw04.freifunk-muenchen.de" port 10000',
+              'ipv4 "gw04.freifunk-muenchen.de" port 10001',
             },
           },
           gw05 = {
             key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
             remotes = {
-              'ipv4 "gw05.ffmuc.net" port 10000',
+              'ipv4 "gw05.ffmuc.net" port 10001',
-              'ipv4 "gw05.freifunk-muenchen.de" port 10000',
+              'ipv4 "gw05.freifunk-muenchen.de" port 10001',
             },
           },
           gw06 = {
             key = 'd6834aa47a14358d804139630812276b3297e767d159c9cfd13fa6fb638000e0',
             remotes = {
-              'ipv4 "gw06.ffmuc.net" port 10000',
+              'ipv4 "gw06.ffmuc.net" port 10001',
-              'ipv4 "gw06.freifunk-muenchen.de" port 10000',
+              'ipv4 "gw06.freifunk-muenchen.de" port 10001',
             },
           },
           gw07 = {
             key = '77b5f5189c360b245e1c934941468cc9cf57f0646465be5765593a95e54449d6',
             remotes = {
-              'ipv4 "gw07.ffmuc.net" port 10000',
+              'ipv4 "gw07.ffmuc.net" port 10001',
-              'ipv4 "gw07.freifunk-muenchen.de" port 10000',
+              'ipv4 "gw07.freifunk-muenchen.de" port 10001',
             },
           },
           gw08 = {
             key = 'e476fb3a72365b550a23b587c0962eed362ed0c237175552b3261d22daaa2055',
             remotes = {
-              'ipv4 "gw08.ffmuc.net" port 10000',
+              'ipv4 "gw08.ffmuc.net" port 10001',
-              'ipv4 "gw08.freifunk-muenchen.de" port 10000',
+              'ipv4 "gw08.freifunk-muenchen.de" port 10001',
             },
           },
           gw09 = {
             key = 'b86f436c9bb13b308dc92c3889fd468c46679d9df0bf4892244372ab415694d0',
             remotes = {
-              'ipv4 "gw09.ffmuc.net" port 10000',
+              'ipv4 "gw09.ffmuc.net" port 10001',
-              'ipv4 "gw09.freifunk-muenchen.de" port 10000',
+              'ipv4 "gw09.freifunk-muenchen.de" port 10001',
             },
           },
           gw10 = {
             key = 'c04358d4818ec108fa4715e4517300cb2d0fa848dfa872770c4b8487d525e8bf',
             remotes = {
-              'ipv4 "gw10.ffmuc.net" port 10000',
+              'ipv4 "gw10.ffmuc.net" port 10001',
-              'ipv4 "gw10.freifunk-muenchen.de" port 10000',
+              'ipv4 "gw10.freifunk-muenchen.de" port 10001',
             },
           },
         },