From a65570360d1351995b4a7df8bb444a136779d3e0 Mon Sep 17 00:00:00 2001
From: Flip <philippe@pilarkto.net>
Date: Mon, 20 Nov 2017 17:13:08 +0100
Subject: [PATCH] increase release remove ibss

---
 README.md |  1 +
 site.conf | 10 ----------
 site.mk   |  2 +-
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 26d77ecfa..d43918730 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.4: v2017.1.4
 * ffs-1.3: v2016.2.7 + 1340 mtu
 * ffs-1.2: v2016.2.6 + ffs-set-segment dns fix + 1312 mtu
 * ffs-1.1: v2016.2.6 + ffs-set-segment dns fix
diff --git a/site.conf b/site.conf
index 51aee9c97..444b022bc 100644
--- a/site.conf
+++ b/site.conf
@@ -29,11 +29,6 @@
             id = 'ffsmesh_batman',
             mcast_rate = 12000,
         },
-        ibss = {
-            ssid = '02:04:08:16:32:64',
-            bssid = '02:04:08:16:32:64',
-            mcast_rate = 12000,
-        },
     },
 
     wifi5 = {
@@ -45,11 +40,6 @@
             id = 'ffsmesh_batman',
             mcast_rate = 12000,
         },
-        ibss = {
-            ssid = '02:04:08:16:32:64',
-            bssid = '02:04:08:16:32:64',
-            mcast_rate = 12000,
-        },
     },
 
 
diff --git a/site.mk b/site.mk
index 9ca97be85..21521f856 100644
--- a/site.mk
+++ b/site.mk
@@ -46,7 +46,7 @@ GLUON_SITE_PACKAGES += \
 	kmod-igb
 endif
 
-DEFAULT_GLUON_RELEASE := 1.3+$(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.4+$(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