From 2a101ddd561057c4b82bc29dbc1d3028e848d1bf Mon Sep 17 00:00:00 2001 From: rubo77 Date: Wed, 16 Nov 2016 09:26:03 +0100 Subject: [PATCH] gluon-core: add dirty flag to gluon-version, add site-version --- include/gluon.mk | 5 ++++- package/gluon-core/Makefile | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/include/gluon.mk b/include/gluon.mk index ef0f5311..29ecf3ed 100644 --- a/include/gluon.mk +++ b/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 diff --git a/package/gluon-core/Makefile b/package/gluon-core/Makefile index 2b9cfb47..9917a5e0 100644 --- a/package/gluon-core/Makefile +++ b/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