From 6eb14c1ad4635792478be5e9a83387fd0e6c9165 Mon Sep 17 00:00:00 2001
From: Bastian Maeuser <mephisto@mephis.to>
Date: Wed, 18 Mar 2015 15:46:59 +0100
Subject: [PATCH 1/3] Last commit for bat14

---
 site.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/site.conf b/site.conf
index fcb2b38..6990e49 100644
--- a/site.conf
+++ b/site.conf
@@ -153,9 +153,10 @@ autoupdater = {
           'http://[fdef:ffc0:4fff::14]/firmware/stable/sysupgrade/',
         },
 				probability = 0.08,
-				good_signatures = 1,
+				good_signatures = 2,
 				pubkeys = {
           '4d6b1a8e2ecfdb59469c38c3659916dd6046cd5270ddd31c3319b21c508eaa07', -- mephisto
+	  '130ff01b6c8df0349c977a5c9539775209493bc771b713e5b3e58cc1d7c4145a', -- duff
 				},
 			},
 			experimental = {

From 88cc801efbdb49be4e7da25187b05bbb5daf190f Mon Sep 17 00:00:00 2001
From: lephisto <mephisto@mephis.to>
Date: Fri, 17 Apr 2015 14:44:06 +0200
Subject: [PATCH 2/3] Update Makefile

change image filename
---
 Makefile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index ea8ea78..1b37ce4 100644
--- a/Makefile
+++ b/Makefile
@@ -4,12 +4,10 @@ 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_RELEASE := $(shell git describe --tags 2>/dev/null)
+ifneq (,$(shell git describe --exact-match --tags 2>/dev/null))
   GLUON_BRANCH := stable
 else
-  GLUON_RELEASE ?= ffrgb-snapshot~$(shell date '+%Y%m%d')~$(shell git describe --always)
   GLUON_BRANCH := experimental
 endif
 

From d85e6baae1acdfbe468b2871df8393652dd978e9 Mon Sep 17 00:00:00 2001
From: lephisto <mephisto@mephis.to>
Date: Fri, 17 Apr 2015 14:47:46 +0200
Subject: [PATCH 3/3] Update Makefile

merge munich tweaks
---
 Makefile | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 1b37ce4..8c5b02d 100644
--- a/Makefile
+++ b/Makefile
@@ -17,10 +17,18 @@ GLUON_MAKE := ${MAKE} -j ${JOBS} -C ${GLUON_BUILD_DIR} \
                       GLUON_RELEASE=${GLUON_RELEASE} \
                       GLUON_BRANCH=${GLUON_BRANCH}
 
-all: gluon-clean
+all: info
+	${MAKE} gluon-clean
 	${MAKE} manifest
 	${MAKE} gluon-clean
-
+	
+info:
+	@echo
+	@echo '#########################'
+	@echo '# FFRGB Firmare build'
+	@echo '# Building release ${GLUON_RELEASE} for branch ${GLUON_BRANCH}'
+	@echo	
+	
 build: gluon-prepare
 	${GLUON_MAKE}