From 049648f873dd96ae9b22978e7104a204ca46fb0f Mon Sep 17 00:00:00 2001 From: Flip <philippe@pilarkto.net> Date: Sat, 1 Jul 2017 01:57:42 +0200 Subject: [PATCH] set version ffs-1.2 --- README.md | 1 + site.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 89b66412e..8b59ade1e 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ Freifunk Stuttgart specific Gluon configuration Doku: https://gluon.readthedocs.org/en/latest/user/site.html Gluon versions used for specific Stuttgart Freifunk Firmware builds: +* ffs-1.2: v2016.2.6 + ffs-set-segment dns fix + 1312 mtu * ffs-1.1: v2016.2.6 + ffs-set-segment dns fix * ffs-1.0: v2016.2.5 * ffs-0.9: v2016.2.1 diff --git a/site.mk b/site.mk index 957d9da9b..5133b833d 100644 --- a/site.mk +++ b/site.mk @@ -46,7 +46,7 @@ GLUON_SITE_PACKAGES += \ kmod-igb endif -DEFAULT_GLUON_RELEASE := 1.1+$(shell date '+%Y-%m-%d')-g.$(shell git -C $(GLUONDIR) log --pretty=format:'%h' -n 1)-s.$(shell git -C $(GLUONDIR)/site log --pretty=format:'%h' -n 1) +DEFAULT_GLUON_RELEASE := 1.2+$(shell date '+%Y-%m-%d')-g.$(shell git -C $(GLUONDIR) log --pretty=format:'%h' -n 1)-s.$(shell git -C $(GLUONDIR)/site log --pretty=format:'%h' -n 1) GLUON_LANGS := de en -- GitLab