diff --git a/README.md b/README.md index 26d77ecfaa5f8444e26d2ca97625d4b30086bd9b..d4391873024c1bc768edf896f9a49ac9266efb2c 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 51aee9c97ea6f1962433ad60eab2f0f975dea1eb..444b022bc06c953c48b46e55d3857e1debcf2f12 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 9ca97be85919cf8515458bd73e2e22475fcf582a..21521f8565a70745e7996b241d73e7b073ca3345 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