From f2bf4cabe3d97c4fcde27c15ae4663a0b1be74b0 Mon Sep 17 00:00:00 2001 From: Jan-Philipp Litza Date: Sun, 4 Dec 2016 13:07:00 +0100 Subject: [PATCH] Set default GLUON_RELEASE to `git describe` of site repo This considerably eases compilation and might even make the build.sh unnecessary --- site.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/site.mk b/site.mk index 56e88f6..6dbded1 100644 --- a/site.mk +++ b/site.mk @@ -30,10 +30,9 @@ GLUON_SITE_PACKAGES := \ firewall \ haveged -DEFAULT_GLUON_PRIORITY := 0 - -# Allow overriding the release number and languages from the command line -GLUON_PRIORITY ?= $(DEFAULT_GLUON_PRIORITY) +# Allow overriding the these variables from the command line +GLUON_RELEASE ?= $(patsubst v%,%,$(shell git -C $(GLUON_SITEDIR) describe --tags --dirty=+)) +GLUON_PRIORITY ?= 0 GLUON_LANGS ?= en de GLUON_REGION ?= eu GLUON_ATH10K_MESH ?= ibss