Merge pull request #22 from Philhil/nightly

gluon 2016.2.2 adjustments and ffs-lowmem-patch

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.0: v2016.2.2
 * ffs-0.9: v2016.2.1
 * ffs-0.8: v2016.2
 * ffs-0.7: v2016.1.3

i18n/de.po

@@ -54,4 +54,10 @@ msgstr ""
 "Viel Spaß mit deinem Knoten und bei der Erkundung von Freifunk!<br /> "
 "<small>Hilf uns weitere Anleitungen, Texte, Grafiken, Applikationen, Schaubilder, und ähnliches zu erstellen die wir hier verlinken können, um jedem neuen Freifunker einen guten Start zu ermöglichen</small>"
 
+msgid "gluon-config-mode:altitude-label"
+msgstr "Höhe"
 
+msgid "gluon-config-mode:altitude-help"
+msgstr ""
+"Die Höhenangabe ist optional und sollte nur gesetzt werden, wenn ein "
+"exakter Wert bekannt ist."

i18n/en.po

@@ -44,3 +44,11 @@ msgstr ""
 "10 seconds during normal operation. The device will then reboot into config "
 "mode.</p>"
 "<p>Have fun with your node and exploring the Freifunk network!</p>"
+
+msgid "gluon-config-mode:altitude-label"
+msgstr "Altitude"
+
+msgid "gluon-config-mode:altitude-help"
+msgstr ""
+"Specifying the altitude is optional and should only be done if a proper "
+"value is known."

i18n/gluon-site.pot

@@ -9,3 +9,9 @@ msgstr ""
 
 msgid "gluon-config-mode:reboot"
 msgstr ""
+
+msgid "gluon-config-mode:altitude-label"
+msgstr ""
+
+msgid "gluon-config-mode:altitude-help"
+msgstr ""

modules

-GLUON_SITE_FEEDS='ffrn'
+GLUON_SITE_FEEDS='ffs'
 
-PACKAGES_FFRN_REPO=https://github.com/Freifunk-Rhein-Neckar/ffrn-packages.git
-PACKAGES_FFRN_COMMIT=d45f18baf0df1bbfaf3f9328526d5cb5da3fc337
+PACKAGES_FFS_REPO=https://github.com/freifunk-stuttgart/Gluon-Packages
+PACKAGES_FFS_COMMIT=5452ccc85d87b957c9613d8ba61e81891150eee0

site.mk

@@ -25,7 +25,7 @@ GLUON_SITE_PACKAGES := \
 	haveged \
 	iptables \
 	iwinfo \
-	ffrn-lowmem-patches \
+	ffs-lowmem-patches \
 
 # add addition network drivers and usb support only to targes where disk space does not matter.
 ifeq ($(GLUON_TARGET),x86-generic)
@@ -45,7 +45,7 @@ GLUON_SITE_PACKAGES += \
 	kmod-igb
 endif
 
-DEFAULT_GLUON_RELEASE := 0.9+$(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.0+$(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