Merge branch 'master' into experimental

CHANGELOG.md

@@ -0,0 +1,33 @@
+# 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
+ - 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

Makefile

@@ -2,12 +2,15 @@ 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}
   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)
@@ -16,22 +19,35 @@ GLUON_MAKE := ${MAKE} -j ${JOBS} -C ${GLUON_BUILD_DIR} \
                       GLUON_RELEASE=${GLUON_RELEASE} \
                       GLUON_BRANCH=${GLUON_BRANCH}
 
-all: build
+all: gluon-clean
+	${MAKE} manifest
+	${MAKE} gluon-clean
 
 build: gluon-prepare
-	echo '${GLUON_RELEASE} (${GLUON_BRANCH})'
-	${GLUON_MAKE} update
 	${GLUON_MAKE}
 
-manifest: gluon-prepare
+images: build
+	${MAKE} images-clean
+	mv ${GLUON_BUILD_DIR}/images .
+
+manifest: images
 	${GLUON_MAKE} 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}
 
 gluon-prepare: ${GLUON_BUILD_DIR}
-	(cd ${GLUON_BUILD_DIR} && git fetch && 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
+	${GLUON_MAKE} update
 
-clean:
+gluon-clean:
 	rm -rf ${GLUON_BUILD_DIR}
+
+images-clean:
+	rm -rf images
+
+clean: gluon-clean images-clean