diff --git a/gluon b/gluon index cefe65e6cfe3bc709ee8fcb180db6736b8a37f7f..b0f219308ebfee2bca33c4fb58543be0648a1c28 160000 --- a/gluon +++ b/gluon @@ -1 +1 @@ -Subproject commit cefe65e6cfe3bc709ee8fcb180db6736b8a37f7f +Subproject commit b0f219308ebfee2bca33c4fb58543be0648a1c28 diff --git a/site.mk b/site.mk index c2bf22c353eb7224539177da1361b6c1dfdb9f21..cbfea8af8d084d2540681c67ba3c66018303dfb0 100644 --- a/site.mk +++ b/site.mk @@ -88,7 +88,7 @@ DEFAULT_BUILD_DATE := $(shell date '+%Y-%m-%d') FFS_BUILD_DATE ?= $(DEFAULT_BUILD_DATE) -DEFAULT_GLUON_RELEASE := experimental+$(FFS_BUILD_DATE)-g.$(shell git -C $(GLUON_SITEDIR)/gluon log --pretty=format:'%h' -n 1)-s.$(shell git -C $(GLUON_SITEDIR) log --pretty=format:'%h' -n 1) +DEFAULT_GLUON_RELEASE := 2.6+$(FFS_BUILD_DATE)-g.$(shell git -C $(GLUON_SITEDIR)/gluon log --pretty=format:'%h' -n 1)-s.$(shell git -C $(GLUON_SITEDIR) log --pretty=format:'%h' -n 1) GLUON_LANGS := de en