Move "release" to site.mk

2014-05-17 15:22:07 +02:00 · 2014-05-17 15:22:07 +02:00 · aee30a8597
parent f66fdb2a44
commit aee30a8597
2 changed files with 5 additions and 1 deletions
--- a/site.conf
+++ b/site.conf
@ -2,7 +2,6 @@
 	hostname_prefix = 'ffhb',
 	site_name = 'Freifunk Bremen',
 	site_code = 'ffhb',
-	release = '0.3.101-nightly' . nightly,

 	prefix4 = '10.196.0.0/20',
 	prefix6 = 'fd2f:5119:0f2c::/64',
--- a/site.mk
+++ b/site.mk
@ -14,3 +14,8 @@ GLUON_SITE_PACKAGES := \
 	kmod-ipt-nathelper \
 	firewall \
 	haveged
+
+DEFAULT_GLUON_RELEASE := 0.3.101-nightly$(shell date '+%Y%m%d'),
+
+# Allow overriding the release number from the command line
+GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)