Merge pull request #4 from ffrgb/master

change build name

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)
+GLUON_RELEASE := $(shell git describe --tags 2>/dev/null)
-ifneq (,${_GIT_DESCRIBE})
+ifneq (,$(shell git describe --exact-match --tags 2>/dev/null))
-  GLUON_RELEASE := ${_GIT_DESCRIBE}
   GLUON_BRANCH := stable
 else
-  GLUON_RELEASE ?= ffrgb-snapshot~$(shell date '+%Y%m%d')~$(shell git describe --always)
   GLUON_BRANCH := experimental
 endif
 
@@ -19,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}
 

site.conf

@@ -153,9 +153,10 @@ autoupdater = {
           'http://[fdef:f00f:1337:cafe::11]/firmware-sad/stable/sysupgrade/',
         },
 				probability = 0.08,
-				good_signatures = 1,
+				good_signatures = 2,
 				pubkeys = {
           '4d6b1a8e2ecfdb59469c38c3659916dd6046cd5270ddd31c3319b21c508eaa07', -- mephisto
+	  '130ff01b6c8df0349c977a5c9539775209493bc771b713e5b3e58cc1d7c4145a', -- duff
 				},
 			},
 			experimental = {