From 222133b78cf632bebbf875b621bc6bcd09d9a05a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 2 Dec 2014 00:31:55 +0100
Subject: [PATCH 1/9] Update to current gluon master

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index dfd2a72..aca2bb3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 GLUON_BUILD_DIR := gluon-build
 GLUON_GIT_URL := git://github.com/freifunk-gluon/gluon.git
-GLUON_GIT_REF := 08ecab23dec1e43b02fdca4caa86d2b7940b2f12
+GLUON_GIT_REF := 5860f81737114e0b0c14851444b6eabaf5731242
 
 _GIT_DESCRIBE = $(shell git describe --tags 2>/dev/null)
 ifneq (,${_GIT_DESCRIBE})

From 67c612de49b3547bbde4c66102d7eefb29039eb6 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 2 Dec 2014 00:33:36 +0100
Subject: [PATCH 2/9] Fetch from gluon origin before checking out a revision

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index aca2bb3..6298469 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ ${GLUON_BUILD_DIR}:
 	git clone ${GLUON_GIT_URL} ${GLUON_BUILD_DIR}
 
 gluon-prepare: ${GLUON_BUILD_DIR}
-	(cd ${GLUON_BUILD_DIR} && git checkout -q ${GLUON_GIT_REF})
+	(cd ${GLUON_BUILD_DIR} && git fetch origin && git checkout -q ${GLUON_GIT_REF})
 	ln -sfT .. ${GLUON_BUILD_DIR}/site
 
 clean:

From 9ddb2b7f259a268fc8d3d6471e890a0557ffaebf Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 5 Jan 2015 01:52:02 +0100
Subject: [PATCH 3/9] Update to gluon v2014.4

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 6298469..fadee26 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 GLUON_BUILD_DIR := gluon-build
 GLUON_GIT_URL := git://github.com/freifunk-gluon/gluon.git
-GLUON_GIT_REF := 5860f81737114e0b0c14851444b6eabaf5731242
+GLUON_GIT_REF := v2014.4
 
 _GIT_DESCRIBE = $(shell git describe --tags 2>/dev/null)
 ifneq (,${_GIT_DESCRIBE})

From d4c5983b82c32898c8c3a4afeb5bd363f3b3e170 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 17 Jan 2015 21:54:37 +0100
Subject: [PATCH 4/9] Move changelog from site.conf to CHANGELOG.md

---
 CHANGELOG.md | 30 ++++++++++++++++++++++++++++++
 site.conf    | 48 ------------------------------------------------
 2 files changed, 30 insertions(+), 48 deletions(-)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..cc71214
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,30 @@
+# Freifunk München Firmware Changelog
+
+## snapshot~20141119
+ - fixed ipv4-prefix to /16 netmask
+ - changed gateways ips to domain-names
+ - changed `msg_pub_key` to automate entering the node-data to our key-form
+ - changed mesh-SSID from 02:0E:8E:1E:61:17 to mesh.ffm
+ - added `ntp_servers` '2.ntp.services.ffm','3.ntp.services.ffm','4.ntp.services.ffm'
+ - changed `site_code` back to ffmuc (instead of ffm)
+ - changed `hostname_prefix` to NULL
+ - changed `mesh_ssid` to mesh.ffmuc
+ - added public key from fpletz
+
+## 0.6~stable20141018
+ - changed ip address for gw02
+
+## 0.6~stable20141011
+ - gw04 hinzugefügt
+ - Text "Knoten hinzufügen" geändert
+ - Autoupdater auf "stable" als Standart-Wert gesetzt
+
+## 0.6~exp20141004
+ - Autoupdater hinzugefügt
+
+## 0.6~exp20140926
+ - Bugfixes
+ - gw02 hinzugefügt
+
+## 0.6~exp20140907
+ - initiale Version
diff --git a/site.conf b/site.conf
index 9f0ff70..c48e55c 100644
--- a/site.conf
+++ b/site.conf
@@ -1,52 +1,4 @@
 --[[	
-
-	******  Gluon site.conf ******
-	Current version: snapshot~20141119
-	Branch: stable
-	Author: Ole
-	Datum: 19.11.2014
-
-	recent bugfixes/changes for next generation firmware (to-be-enrolled shortly)
-
-
-
-	Changelog:
-
-	snapshot~20141119	19.11.2014	Ole
-        - fixed ipv4-prefix to /16 netmask (04.11.2014)
-        - changed gateways ips to domain-names
-        - changed msg_pub_key to automate entering the node-data to our key-form (01.11.2014)
-        - changed mesh-SSID from 02:0E:8E:1E:61:17 to mesh.ffm
-        - added ntp_servers '2.ntp.services.ffm','3.ntp.services.ffm','4.ntp.services.ffm' (18.11.2014)
-        - changed site_code back to ffmuc (instead of ffm) (18.11.2014)
-        - changed hostname_prefix to NULL (18.11.2014)
-        - changed mesh_ssid to mesh.ffmuc
-        - added public key from fpletz
-
-	0.6~stable20141018	18.10.2014	Ole
-	- changed ip address for gw02
-
-	0.6~stable20141011	11.10.2014	Ole
-	- gw04 hinzugefügt
-	- Text "Knoten hinzufügen" geändert
-	- Autoupdater auf "stable" als Standart-Wert gesetzt
-
-	0.6~exp20141004		04.10.2014	Ole
-	- Autoupdater hinzugefügt
-
-	0.6~exp20140926		26.09.2014	Ole
-	- Bugfixes
-	- gw02 hinzugefügt
-
-	0.6~exp20140907		07.09.2014	Ole
-	- initiale Version
-
-
-	******************************
-
-
-
-
 	gluon site.conf example
 
         This file contains the Munich freifunk site.conf which was adopted from the original freifunk suite used in Luebeck. 

From 7eade8015d085d24f99edbf11f103457a4ddb48b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 17 Jan 2015 22:01:15 +0100
Subject: [PATCH 5/9] Add changelog for 2015.1 release

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc71214..9d02eab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Freifunk München Firmware Changelog
 
+## 2015.1
+ - Updated to Gluon 2014.4 release
+
 ## snapshot~20141119
  - fixed ipv4-prefix to /16 netmask
  - changed gateways ips to domain-names

From aa828a685e913020ae30befb3e48315d3dbf8d4d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 17 Jan 2015 22:45:28 +0100
Subject: [PATCH 6/9] Makefile: Add signature support (requires ecdsautils)

---
 Makefile | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index fadee26..7529419 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,8 @@ GLUON_BUILD_DIR := gluon-build
 GLUON_GIT_URL := git://github.com/freifunk-gluon/gluon.git
 GLUON_GIT_REF := v2014.4
 
+SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
+
 _GIT_DESCRIBE = $(shell git describe --tags 2>/dev/null)
 ifneq (,${_GIT_DESCRIBE})
   GLUON_RELEASE := ${_GIT_DESCRIBE}
@@ -16,22 +18,25 @@ GLUON_MAKE := ${MAKE} -j ${JOBS} -C ${GLUON_BUILD_DIR} \
                       GLUON_RELEASE=${GLUON_RELEASE} \
                       GLUON_BRANCH=${GLUON_BRANCH}
 
-all: build
+all: build manifest
 
 build: gluon-prepare
 	echo '${GLUON_RELEASE} (${GLUON_BRANCH})'
-	${GLUON_MAKE} update
 	${GLUON_MAKE}
 
 manifest: gluon-prepare
 	${GLUON_MAKE} manifest
 
+sign: manifest
+	gluon-build/contrib/sign.sh ${SECRET_KEY_FILE} gluon-build/images/sysupgrade/${GLUON_BRANCH}.manifest
+
 ${GLUON_BUILD_DIR}:
 	git clone ${GLUON_GIT_URL} ${GLUON_BUILD_DIR}
 
 gluon-prepare: ${GLUON_BUILD_DIR}
 	(cd ${GLUON_BUILD_DIR} && git fetch origin && git checkout -q ${GLUON_GIT_REF})
 	ln -sfT .. ${GLUON_BUILD_DIR}/site
+	${GLUON_MAKE} update
 
 clean:
 	rm -rf ${GLUON_BUILD_DIR}

From fc2074cfa0561bdaa154edada6e7bd650f9f59ff Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 21 Jan 2015 03:15:18 +0100
Subject: [PATCH 7/9] Move images folder & clean gluon-build folder after build

---
 Makefile | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 7529419..a72ccab 100644
--- a/Makefile
+++ b/Makefile
@@ -18,17 +18,22 @@ GLUON_MAKE := ${MAKE} -j ${JOBS} -C ${GLUON_BUILD_DIR} \
                       GLUON_RELEASE=${GLUON_RELEASE} \
                       GLUON_BRANCH=${GLUON_BRANCH}
 
-all: build manifest
+all: gluon-clean
+	make manifest
+	make gluon-clean
 
 build: gluon-prepare
-	echo '${GLUON_RELEASE} (${GLUON_BRANCH})'
 	${GLUON_MAKE}
 
-manifest: gluon-prepare
+images: build
+	make images-clean
+	mv ${GLUON_BUILD_DIR}/images .
+
+manifest: images
 	${GLUON_MAKE} manifest
 
-sign: manifest
-	gluon-build/contrib/sign.sh ${SECRET_KEY_FILE} gluon-build/images/sysupgrade/${GLUON_BRANCH}.manifest
+sign: gluon-prepare manifest
+	${GLUON_BUILD_DIR}/contrib/sign.sh ${SECRET_KEY_FILE} images/sysupgrade/${GLUON_BRANCH}.manifest
 
 ${GLUON_BUILD_DIR}:
 	git clone ${GLUON_GIT_URL} ${GLUON_BUILD_DIR}
@@ -38,5 +43,10 @@ gluon-prepare: ${GLUON_BUILD_DIR}
 	ln -sfT .. ${GLUON_BUILD_DIR}/site
 	${GLUON_MAKE} update
 
-clean:
+gluon-clean:
 	rm -rf ${GLUON_BUILD_DIR}
+
+images-clean:
+	rm -rf images
+
+clean: gluon-clean images-clean

From bb617121366872871e16feef503579fd4855e8bb Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 21 Jan 2015 04:59:27 +0100
Subject: [PATCH 8/9] Set gluon branch to experimental if building snapshot

---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index a72ccab..06d9016 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,7 @@ ifneq (,${_GIT_DESCRIBE})
   GLUON_BRANCH := stable
 else
   GLUON_RELEASE ?= snapshot~$(shell date '+%Y%m%d')~$(shell git describe --always)
+  GLUON_BRANCH := experimental
 endif
 
 JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l)

From 67d8ae906c32c69f7ca86bc25c820a676f0063ce Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 21 Jan 2015 04:59:51 +0100
Subject: [PATCH 9/9] Use ${MAKE} instead of calling make

---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 06d9016..451c302 100644
--- a/Makefile
+++ b/Makefile
@@ -20,14 +20,14 @@ GLUON_MAKE := ${MAKE} -j ${JOBS} -C ${GLUON_BUILD_DIR} \
                       GLUON_BRANCH=${GLUON_BRANCH}
 
 all: gluon-clean
-	make manifest
-	make gluon-clean
+	${MAKE} manifest
+	${MAKE} gluon-clean
 
 build: gluon-prepare
 	${GLUON_MAKE}
 
 images: build
-	make images-clean
+	${MAKE} images-clean
 	mv ${GLUON_BUILD_DIR}/images .
 
 manifest: images