Browse Source

gluon-core: add dirty flag to gluon-version, add site-version

rubo77 7 years ago
parent
commit
2a101ddd56
2 changed files with 5 additions and 1 deletions
  1. 4 1
      include/gluon.mk
  2. 1 0
      package/gluon-core/Makefile

+ 4 - 1
include/gluon.mk

@@ -35,9 +35,12 @@ $(GLUON_SITEDIR)/site.mk:
 -include $(GLUON_SITEDIR)/site.mk
 
 
-GLUON_VERSION := $(shell cd $(GLUONDIR) && git describe --always 2>/dev/null || echo unknown)
+GLUON_VERSION := $(shell cd $(GLUONDIR) && git describe --always --dirty=+ 2>/dev/null || echo unknown)
 export GLUON_VERSION
 
+GLUON_SITE_VERSION := $(shell cd $(GLUON_SITEDIR) && git --git-dir=.git describe --always --dirty=+ 2>/dev/null || echo unknown)
+export GLUON_SITE_VERSION
+
 GLUON_LANGS ?= en
 export GLUON_LANGS
 

+ 1 - 0
package/gluon-core/Makefile

@@ -38,6 +38,7 @@ define Package/gluon-core/install
 
 	$(INSTALL_DIR) $(1)/lib/gluon
 	echo "$(GLUON_VERSION)" > $(1)/lib/gluon/gluon-version
+	echo "$(GLUON_SITE_VERSION)" > $(1)/lib/gluon/site-version
 endef
 
 define Package/gluon-core/postinst