aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrubo77 <github@r.z11.de>2018-06-21 23:24:49 +0200
committerrubo77 <github@r.z11.de>2018-06-21 23:24:49 +0200
commitc019e71e50e522889b8b9a8fc8473fc8c47b324c (patch)
treee095a6423325f80a98574a623bb8b6c0f7403789
parentcb0c49dfa6b0522b197869cd653c8de1aca2947d (diff)
parent0f1a5dcaff1e241bbb8fa1237c2d59cc8457df42 (diff)
Merge remote-tracking branch 'origin/nightly'
# Conflicts: # CHANGELOG.md # README.md # make-release.sh # modules # site.conf # site.mk # tests/validate_site.sh
-rw-r--r--.travis.yml13
-rw-r--r--CHANGELOG.md47
-rw-r--r--README.md8
-rw-r--r--i18n/de.po86
-rw-r--r--i18n/en.po73
-rwxr-xr-x[-rw-r--r--]make-release.sh20
-rw-r--r--modules36
-rw-r--r--site.conf118
-rw-r--r--site.mk104
-rwxr-xr-x[-rw-r--r--]tests/validate_site.sh9
10 files changed, 296 insertions, 218 deletions
diff --git a/.travis.yml b/.travis.yml
index f953ee2..dc45fcc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,14 @@
language: bash
-sudo: true
-
-before_install:
- - sudo apt-get -qq update
- - sudo apt-get install lua5.1 luarocks
+addons:
+ apt:
+ packages:
+ - lua5.1
+ - luarocks
install:
- - sudo luarocks install lua-cjson
+ - eval $(luarocks path --bin)
+ - luarocks install --local lua-cjson
script:
- bash tests/validate_site.sh
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f70056..175b631 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,38 @@
+Änderungen mit Firmwareversion 2017.1.8 basierend auf Gluon 2017.1.8
+====================================================================
+
+Freifunk Kiel spezifische Änderungen:
+-------------------------------------
+
+ * Kontaktfeld ist nicht mehr Pflicht
+
+Offizielle Changelogs zum nachlesen:
+------------------------------------
+
+* https://gluon.readthedocs.io/en/latest/releases/v2017.1.html
+* https://gluon.readthedocs.io/en/latest/releases/v2017.1.1.html
+* https://gluon.readthedocs.io/en/latest/releases/v2017.1.2.html
+* https://gluon.readthedocs.io/en/latest/releases/v2017.1.3.html
+* https://gluon.readthedocs.io/en/v2017.1.x/releases/v2017.1.4.html
+* https://gluon.readthedocs.io/en/v2017.1.x/releases/v2017.1.5.html
+* https://gluon.readthedocs.io/en/v2017.1.x/releases/v2017.1.6.html
+* https://gluon.readthedocs.io/en/v2017.1.x/releases/v2017.1.7.html
+* https://gluon.readthedocs.io/en/v2017.1.x/releases/v2017.1.7.html
+
+<br>
+
+Änderungen mit Firmwareversion 2017.1.7 basierend auf Gluon 2017.1.7
+====================================================================
+
+Freifunk Kiel spezifische Änderungen:
+-------------------------------------
+
+ * Neu: gluon-alt-esc [1] erlaubt den lokalen Knoten für andere Knoten als lokalen Exit bereitzustellen
+
+ - [1] - https://github.com/rubo77/gluon-alt-esc
+
+<br>
+
Änderungen mit Firmwareversion 2016.2.7 basierend auf Gluon 2016.2.7
====================================================================
@@ -40,7 +75,7 @@ Freifunk Kiel spezifische Änderungen:
* roamguide löscht jetzt seine log-Dateien im /tmp Ordner
* quickfix scannt mit niedrigerer Priorität
* mesh (802.11s) und ibss (AdHoc) sind aktiviert, um den Übergang zu 802.11s-only vorzubereiten.
-
+
Generelle Änderungen an Gluon 2016.2.6
----------------------------
* Der TP-Link TL-WR841N/ND v12 wird unterstützt
@@ -71,7 +106,7 @@ Freifunk Kiel spezifische Änderungen:
* Texte im Config Mode überarbeitet
* Der Knotenalarm auf unserer Webseite wird besser beworben
* In der Anmelde-Email kann man sich gleich für den Knotenalarm anmelden
-
+
Generelle Änderungen an Gluon 2016.2.5
----------------------------
* Ein Fehler wurde behoben, der nur batman-adv 15 betrifft, welches wir in Kiel nicht nutzen
@@ -104,7 +139,7 @@ Probleme mit Gluon 2016.2.4
* Beim Update von x86 Systemen kann es zum Verlust der Konfiguration kommen, wenn die Kernel Partition anwächst.
* Wenn Mesh on WAN aktiviert ist, wird bei bestimmten Modellen die MAC Adresse des WAN Ports verändert. Dies kann in Umgebungen mit vorgeschalteten MAC Filterregeln zu Problemen führen.
* Die TX Leistung der meisten Ubiquiti Geräte ist zu hoch eingestellt. Genaue Werte sind unbekannt. Es wird empfolen die Sendeleistung per Hand zu reduzieren.
-
+
Offizielle Changelogs zum nachlesen:
------------------------------------
@@ -120,7 +155,7 @@ Offizielle Changelogs zum nachlesen:
* respondd wird nun bei einem Fehler automatisch neu gestartet (#863)
* autoupdater timeouts verändert, dies verhindert ein "hängen" des Autoupdaters beim Manifest-Download. Er wurde nun so verbessert, dass der wget Prozess jederzeit sicher beendet werden kann. (#987)
* Änderung der WLAN-Länderkodierung wurde verbessert (#1001)
-
+
Mehr Routermodelle werden unterstützt
-------------------------------------
@@ -149,7 +184,7 @@ Offizielle Changelogs zum nachlesen:
* Fix: Netzwerk-Port des Ubiquiti UAP AC Lite (#911)
* Build: /tmp Verzeichnis des Hosts wird nicht länger genutzt (f9072a36411b)
* Fix: mesh interface type respondd/alfred announcements wenn VLANs über IBSS genutzt werden (#941)
- * Fix: next-node ebtables Regeln ohne next_node.ip4 (9dbe9f785d2b)
+ * Fix: next-node ebtables Regeln ohne next_node.ip4 (9dbe9f785d2b)
* x86-generic und x86-64 images haben nun PATA und MMC support.
* Clean up opkg postinst scripts während der Imageerstellung.
@@ -157,7 +192,7 @@ Mehr Routermodelle werden unterstützt
-------------------------------------
ar71xx-generic
- TP-Link: CPE210/510 EU/US versions, TL-WA801N/ND v3, TL-WR841ND v11 EU/US versions
+ TP-Link: CPE210/510 EU/US versions, TL-WA801N/ND v3, TL-WR841ND v11 EU/US versions
Offizielle Changelogs zum nachlesen:
------------------------------------
diff --git a/README.md b/README.md
index 5e4bde6..0c06a1e 100644
--- a/README.md
+++ b/README.md
@@ -33,6 +33,12 @@ You can always find the current release at https://freifunk.in-kiel.de/firmware.
# Development
+## Validation
+
+You can validate your changes to this repository by calling the validate_site.sh file with
+
+ tests/validate_site.sh
+
## General process
- Usually no commits should affect `master` directly.
@@ -47,6 +53,8 @@ You can always find the current release at https://freifunk.in-kiel.de/firmware.
These Kieler Freifunk firmwares have been released:
+- 2016.2.7
+ - Based on Gluon 2016.2.7
- 2016.2.6.2
- Based on Gluon 2016.2.6
- Deactivated legacy ibss meshing protocol
diff --git a/i18n/de.po b/i18n/de.po
index 69790a5..b337500 100644
--- a/i18n/de.po
+++ b/i18n/de.po
@@ -27,25 +27,25 @@ msgstr ""
"er auf den Servern des Kieler Freifunk-Projektes eingetragen wurde, "
"kann sich dein Knoten mit dem Kieler Mesh-VPN verbinden. Bitte "
"schicke dazu diesen Schlüssel und den Namen deines Knotens "
-"(<em><%= escape(hostname) %></em>) an <a href="
-"\"mailto:freifunk-keys@lists.in-kiel.de?subject=Anmeldung:%20<%= urlescape(hostname) %>&amp;"
-"body=%23%20<%= urlescape(hostname) %>%0A"
-"%23%20<%= sysconfig.primary_mac %>%0A"
-"key%20%22<%= pubkey %>%22%3B%0A%0A"
-"Ich%20m%C3%B6chte%20informiert%20werden%2C%20falls%20mein%20Knoten%20offline%20ist.%0A"
-"Bitte%20meldet%20mich%20beim%20Knotenalarm%20an.%0A%0AGru%C3%9F%2C%20%0A%0A"
+"(<em><%= pcdata(hostname) %></em>) an <a href="
+"\"mailto:freifunk-keys@lists.in-kiel.de?"
+"subject=<%= urlencode('Anmeldung: ' .. hostname) %>&amp;"
+"body=<%= urlencode('# ' .. hostname .. '\n# ' .. sysconfig.primary_mac .. '\nkey=') %>"
+"%22<%= pubkey %>%22"
+"<%= urlencode(';\n\nIch habe zur Kenntnis genommen, dass der im Knoten von mir eingetragene Kontakt im Internet öffentlich einsehbar ist und von beliebigen Diensten (z.B. der Freifunk-Karte) verwendet werden kann.') %>"
+"<%= urlencode(';\n\nIch möchte informiert werden, falls mein Knoten offline ist.\nBitte meldet mich beim Knotenalarm an.\n\nGruß, \n\n') %>"
"\">freifunk-keys@lists.in-kiel.de</a>. <small>Ein Klick auf "
-"den E-Mail Link müsste&trade; dein E-Mail Programm öffnen und alle benötigten "
+"den E-Mail Link müsste dein E-Mail Programm öffnen und alle benötigten "
"Informationen in eine neue Mail einfügen. Deine E-Mail Adresse wird selbstverständlich vertraulich "
"behandelt und nicht weitergegeben. Alternativ kannst du uns den Schlüssel auch im Webchat mitteilen.</small>"
"</p>"
"<div class=\"the-key\">"
-" # <%= escape(hostname) %>"
+" # <%= pcdata(hostname) %>"
" <br/>"
"<%= pubkey %>"
"</div>"
"<p>Dein Knoten startet gerade neu und wird anschließend versuchen, "
-"sich mit anderen Freifunk-Knoten in seiner Nähe "
+"sich mit anderen Freifunkknoten in seiner Nähe "
"und über deine Internetleitung, online mit einem Freifunk-Server zu verbinden.</p>"
"<p>Bitte vergiss nicht das Netzwerkkabel vom gelben LAN Port in den blauen WAN Port umzustecken.</p>"
@@ -55,16 +55,17 @@ msgstr ""
"Dein Knoten kann also nur eine Internetverbindung aufbauen, wenn andere Freifunk-"
"Knoten in Reichweite schon eine Internetverbindung haben.</div>"
"Bitte registriere deinen Knoten "
-"(<em><%= escape(hostname) %></em>) indem du eine E-Mail schickst an <a href="
-"\"mailto:freifunk-keys@lists.in-kiel.de?subject=Anmeldung:%20<%= urlescape(hostname) %>&amp;"
-"body=%23%20<%= urlescape(hostname) %>%0A"
-"%23%20<%= sysconfig.primary_mac %>%0A"
-"%23%20kein%20Mesh-VPN%0A%0A"
-"Ich%20m%C3%B6chte%20informiert%20werden%2C%20falls%20mein%20Knoten%20offline%20ist.%0A"
-"Bitte%20meldet%20mich%20beim%20Knotenalarm%20an.%0A%0AGru%C3%9F%2C%20%0A%0A"
-"\">freifunk-keys@lists.in-kiel.de</a>.</p>"
+"(<em><%= pcdata(hostname) %></em>) indem du eine E-Mail schickst an <a href="
+"\"mailto:freifunk-keys@lists.in-kiel.de?"
+"subject=<%= urlencode('Anmeldung: ' .. hostname) %>&amp;"
+"body=<%= urlencode('# ' .. hostname .. '\n# ' .. sysconfig.primary_mac .. '\n# kein mesh-VPN\n\nIch möchte informiert werden, falls mein Knoten offline ist.\nBitte meldet mich beim Knotenalarm an.\n\nGruß, \n\n') %>"
+"\">freifunk-keys@lists.in-kiel.de</a>. <small>Ein Klick auf "
+"den E-Mail Link müsste dein E-Mail Programm öffnen und alle benötigten "
+"Informationen in eine neue Mail einfügen. Deine E-Mail Adresse wird selbstverständlich vertraulich "
+"behandelt und nicht weitergegeben. Alternativ kannst du uns deine Anmeldung auch im Webchat mitteilen.</small>"
+"</p>"
"<p>Dein Knoten startet gerade neu und wird anschließend versuchen, "
-"sich mit anderen Freifunk-Knoten in seiner Nähe zu verbinden.</p>"
+"sich mit anderen Freifunkknoten in seiner Nähe zu verbinden.</p>"
msgid "gluon-config-mode:reboot"
msgstr ""
@@ -72,43 +73,44 @@ msgstr ""
"<p>Einen Online Chat und weitere Informationen zur Freifunk-Community findest du auf den Webseiten von "
"<a href=\"http://freifunk.in-kiel.de/\" target=\"_blank\">Freifunk Kiel</a>.</p>"
"<dl> "
-" <dt>&bull; Konfigurations Modus</dt> "
+" <dt>- Konfigurations Modus</dt> "
" <dd>Du kannst jederzeit in den Konfigurations-Modus zurrückkehren. Einfach 10 Sekunden den Resetknopf des Knotens drücken, bis die LEDs alle gleichzeitig aufleuchten.</dd> "
-" <dt>&bull; Knoten-Alarm</dt> "
+" <dt>- Knoten-Alarm</dt> "
" <dd>Für automatische Benachrichtigung, falls dein Knoten eine längere Zeit offline ist, kannst du dich <a href=\"http://freifunk.in-kiel.de/nodealarm.html\" target=\"_blank\">beim Knoten-Alarm anmelden</a></dd> "
-" <dt>&bull; Karte</dt> "
+" <dt>- Karte</dt> "
" <dd>Eine Karte von Freifunk Kiel ist unter <a href=\"http://mesh.freifunk.in-kiel.de/\" target=\"_blank\">http://mesh.freifunk.in-kiel.de/</a> erreichbar.</dd> "
-" <dt>&bull; Next-Node</dt> "
+" <dt>- Next-Node</dt> "
" <dd>Der Knoten mit dem man aktuell verbunden ist, kann unter der sogenannten Next-Node Adresse erreicht werden. Diese ist für alle Knoten gleich und enthält Informationen über den Knoten und seine Umgebung:</dd>"
-" <dd>&bull; Lokaler Link &mdash; <a href=\"http://node.ffki/\" target=\"_blank\">http://node.ffki/</a></dd>"
-" <dd>&bull; oder IPv6 &mdash; <a href=\"http://[fda1:384a:74de:4242::ffff]/\" target=\"_blank\">http://[fda1:384a:74de:4242::ffff]/</a></dd>"
-" <dt>&bull; Mach Mit!</dt> "
+" <dd>- Lokaler Link: <a href=\"http://node.ffki/\" target=\"_blank\">http://node.ffki/</a></dd>"
+" <dd>- oder IPv6: <a href=\"http://[fda1:384a:74de:4242::ffff]/\" target=\"_blank\">http://[fda1:384a:74de:4242::ffff]/</a></dd>"
+" <dt>- Mach Mit!</dt> "
" <dd>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.</dd>"
"</dl> "
"<p>Viel Spaß mit deinem Knoten und bei der Erkundung von Freifunk!</p>"
-"</p>"
-
-# translations from within default gluon:
-
-msgid "Altitude"
+msgid "gluon-config-mode:altitude-label"
msgstr "Höhe (3m pro Stock)"
-msgid ""
-"Specifying the altitude is optional and should only be done if a proper "
-"value is known."
+msgid "gluon-config-mode:altitude-help"
msgstr ""
"Die Höhenangabe ist optional und kann geschätzt werden mit 3m pro Stockwerk."
-msgid "e.g. E-mail or phone number"
-msgstr "z.B. E-Mail, Chatname oder Telefonnummer"
-
-# translations needed for gluon master (commit/34deeac380527d5bfc2a87d1ebae0a784af76c6f)
+# translations from within default gluon:
-msgid "gluon-config-mode:altitude-label"
-msgstr "Höhe (3m pro Stock)"
+msgid "e.g. E-mail or phone number"
+msgstr "z.B. E-Mail, Chatname oder Telefonnummer"
-msgid "gluon-config-mode:altitude-help"
+msgid ""
+"Please provide your contact information here to allow others to contact "
+"you. Note that this information will be visible <em>publicly</em> on "
+"the internet together with your node's coordinates."
msgstr ""
-"Die Höhenangabe ist optional und kann geschätzt werden mit 3m pro Stockwerk."
+"Bitte hinterlege hier einen Hinweis, um anderen zu ermöglichen, "
+"Kontakt mit dir aufzunehmen. Beachte, dass dieser Hinweis auch "
+"<em>öffentlich</em> im Internet, zusammen mit den Koordinaten "
+"deines Knotens, einsehbar sein wird. Das bedeutet, dass diese Informationen "
+"von jedem heruntergeladen und verarbeitet werden kann. Für den Betrieb sind diese "
+"Informationen zwar nicht erforderlich, aber es ist für den Betrieb des Freifunk-Netzes "
+"von Vorteil, wenn sich alle gegenseitig erreichen können. Eine Speicherung erfolgt auf diesem Knoten. "
+"Die Daten können durch dich in diesem Menü eigenständig wieder gelöscht werden."
diff --git a/i18n/en.po b/i18n/en.po
index d5908c4..b6d3829 100644
--- a/i18n/en.po
+++ b/i18n/en.po
@@ -20,68 +20,65 @@ msgstr ""
"<p>This is the public key for your Freifunk node. You can only "
"connect the node to the Freifunk mesh VPN after the key has been registered on "
"the Freifunk Kiel servers. "
-"To register the key send it together with your node's name (<em><%= escape(hostname) %></em>) to <a href="
-"\"mailto:freifunk-keys@lists.in-kiel.de?subject=Anmeldung:%20<%= urlescape(hostname) %>&amp;"
-"body=%23%20<%= urlescape(hostname) %>%0A"
-"%23%20<%= sysconfig.primary_mac %>%0A"
-"key%20%22<%= pubkey %>%22%3B%0A%0A"
-"Ich%20m%C3%B6chte%20informiert%20werden%2C%20falls%20mein%20Knoten%20offline%20ist.%0A"
-"Bitte%20meldet%20mich%20beim%20Knotenalarm%20an.%0A%0AGru%C3%9F%2C%20%0A%0A"
+"To register the key send it together with your node's name "
+"(<em><%= pcdata(hostname) %></em>) to <a href="
+"\"mailto:freifunk-keys@lists.in-kiel.de?"
+"subject=<%= urlencode('Anmeldung: ' .. hostname) %>&amp;"
+"body=<%= urlencode( '# ' .. hostname .. '\n# ' .. sysconfig.primary_mac .. '\nkey=') %>"
+"%22<%= pubkey %>%22"
+"<%= urlencode(';\n\nI have taken note that the contact I entered in the node is publicly available on the Internet and can be used by any services (e.g. the meshviewer map).') %>"
+"<%= urlencode(';\n\nI would like to be informed whenever my node is offline.\nPlease add my contact to the nodewatcher.\n\nThanks, \n\n') %>"
"\">freifunk-keys@lists.in-kiel.de</a>."
"</p>"
"<div class=\"the-key\">"
-" # <%= escape(hostname) %>"
+" # <%= pcdata(hostname) %>"
" <br/>"
"<%= pubkey %>"
"</div>"
-"<p>The node is currently rebooting and will try to connect to other "
-"Freifunk nodes nearby and to the Freifunk server online afterwards.</p>"
msgid "gluon-config-mode:nopubkey"
msgstr ""
"<p><div class=\"the-key\">You selected not to use Mesh-VPN. Your node will only be able "
-"to connect to the internet if other nodes in reach already have a connection</div>"
-"Please register your node's name (<em><%= escape(hostname) %></em>) at <a href="
-"\"mailto:freifunk-keys@lists.in-kiel.de?subject=Anmeldung:%20<%= urlescape(hostname) %>&amp;"
-"body=%23%20<%= urlescape(hostname) %>%0A"
-"%23%20<%= sysconfig.primary_mac %>%0A"
-"%23%20no%20Mesh-VPN%20activated%0A%0A"
-"Ich%20m%C3%B6chte%20informiert%20werden%2C%20falls%20mein%20Knoten%20offline%20ist.%0A"
-"Bitte%20meldet%20mich%20beim%20Knotenalarm%20an.%0A%0AGru%C3%9F%2C%20%0A%0A"
-"\">freifunk-keys@lists.in-kiel.de</a>.</p>"
-"<p>The node is currently rebooting and will try to connect to other "
-"Freifunk nodes nearby afterwards.</p>"
+"to connect to the internet if other nodes in reach already have a "
+"connection</div>Please register your node's name (<em><%= pcdata(hostname) %></em>) and"
+"send an email to <a href=\"mailto:freifunk-keys@lists.in-kiel.de?"
+"subject=<%= urlencode('Anmeldung: ' .. hostname) %>&amp;"
+"body=<%= urlencode('# ' .. hostname .. '\n# ' .. sysconfig.primary_mac .. '\n# no mesh-VPN\n\nI would like to be informed whenever my node is offline.\nPlease add my contact to the nodewatcher.\n\nThanks, \n\n') %>"
+"\">freifunk-keys@lists.in-kiel.de</a>."
+"</p>"
msgid "gluon-config-mode:reboot"
msgstr ""
-"<p>You can find an online Chat and lots more information about the Freifunk Kiel community on "
+"<p>The node is currently rebooting and will try to connect to other "
+"nearby Freifunk nodes afterwards. "
+"You can find an online Chat and lots more information about the Freifunk Kiel community on "
"<a href=\"http://freifunk.in-kiel.de/\" target=\"_blank\">our homepage</a>.</p>"
"<p>To get back to this configuration interface, press the reset button for "
"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>"
-
-# translations from within default gluon:
-
-msgid "Altitude"
+msgid "gluon-config-mode:altitude-label"
msgstr "Altitude (3m per storey)"
-msgid ""
-"Specifying the altitude is optional and should only be done if a proper "
-"value is known."
+msgid "gluon-config-mode:altitude-help"
msgstr ""
-"Specifying the altitude is optional and can be aproximated with 3m per storey."
+"Specifying the altitude is optional and can be approximated with 3m per storey."
+
+# translations from within default gluon:
msgid "e.g. E-mail or phone number"
msgstr "e.g. E-mail, chat buddy or phone number"
-
-# translations needed for gluon master (commit/34deeac380527d5bfc2a87d1ebae0a784af76c6f)
-
-msgid "gluon-config-mode:altitude-label"
-msgstr "Altitude (3m per storey)"
-
-msgid "gluon-config-mode:altitude-help"
+msgid ""
+"Please provide your contact information here to allow others to contact "
+"you. Note that this information will be visible <em>publicly</em> on "
+"the internet together with your node's coordinates."
msgstr ""
-"Specifying the altitude is optional and can be aproximated with 3m per storey."
+"Please provide your contact information here to allow others to contact "
+"you. Note that this information will be visible <em>publicly</em> on "
+"the internet together with your node's coordinates. This means it can be "
+"downloaded and processed by anyone. This information is "
+"not required to operate a node, but it is of great advantage, if everyone in "
+"the net can contact everyone. If you chose to enter data, it will be "
+"stored on this node and can be deleted by yourself here on this page at any time."
diff --git a/make-release.sh b/make-release.sh
index 1f9c5f2..959b92d 100644..100755
--- a/make-release.sh
+++ b/make-release.sh
@@ -15,7 +15,7 @@ set -u
set -e
# if version is unset, will use the default version from site.mk
-VERSION=${3:-"2016.2.7"}
+VERSION=${3:-"2017.1.8~exp$(date '+%y%m%d%H%M')"}
# branch must be set to either rc, nightly or stable
BRANCH=${2:-"stable"}
# must point to valid ecdsa signing key created by ecdsakeygen, relative to Gluon base directory
@@ -34,13 +34,12 @@ MAKE_CLEAN="1"
# set this to "V=s" to get more output
VERBOSE=""
-#ONLY_TARGET must be set to "" or i.e. "ar71xx-generic"
+#ONLY_TARGET must be set to "" or i.e. "ar71xx-tiny"
#ONLY_TARGET=""
ONLY_TARGET="ar71xx-generic"
#to build only one device set DEVICES list (only if $ONLY_TARGET!="")
-DEVICES=""
-#not supported in 2016.x:
-#DEVICES="DEVICES=tp-link-tl-wr842n-nd-v3"
+DEVICES=''
+#DEVICES='DEVICES="tp-link-tl-wr842n-nd-v1 tp-link-tl-wr842n-nd-v2 tp-link-tl-wr842n-nd-v3"'
cd ../
if [ ! -d "site" ]; then
@@ -53,7 +52,7 @@ if [ "$(whoami)" == "root" ]; then
return
fi
-if [ -d ../lede/ ]; then
+if [ -d ../openwrt/ ]; then
echo openwrt was checked out, this will break, if you build master now
fi
@@ -84,7 +83,7 @@ RASPBPI="brcm2708-bcm2708 brcm2708-bcm2709"
X86="x86-64 x86-generic x86-xen_domu"
WDR4900="mpc85xx-generic"
-TARGETS="ar71xx-generic $NOT_LEDE ar71xx-nand $WDR4900 $RASPBPI $X86"
+TARGETS="ar71xx-generic $ONLY_LEDE ar71xx-nand $WDR4900 $RASPBPI $X86"
if [ "$BROKEN" != "" ]; then
TARGETS+=" $BANANAPI $MICROTIK $WRT1200AC"
fi
@@ -111,8 +110,7 @@ date >> build.log
echo "Compilation complete, creating manifest(s)" | tee -a build.log
set +e
-#lede: MANIFEST_OPTINS="GLUON_RELEASE=$VERSION $BROKEN $CORES"
-MANIFEST_OPTINS="$BROKEN $CORES"
+MANIFEST_OPTINS="GLUON_RELEASE=$VERSION $BROKEN $CORES"
if [[ true ]]; then
B="nightly"
echo -e "make $MANIFEST_OPTINS GLUON_BRANCH=$B manifest" >> build.log
@@ -135,8 +133,8 @@ contrib/sign.sh $SIGNING_KEY output/images/sysupgrade/nightly.manifest >> build.
if [[ "$BRANCH" == "nightly" ]] || [[ "$BRANCH" == "stable" ]]; then
echo -e "contrib/sign.sh $SIGNING_KEY output/images/sysupgrade/nightly.manifest" >> build.log
contrib/sign.sh $SIGNING_KEY output/images/sysupgrade/nightly.manifest >> build.log 2>&1
- # set date to before 04:00
- sed -e 's/DATE=.*/DATE='$(date '+%y-%m-%d')' 00:00:00+02:00/g' output/images/sysupgrade/nightly.manifest
+ # set date to before 04:00
+ sed -e 's/DATE=.*/DATE='$(date '+%y-%m-%d')' 00:00:00+02:00/g' output/images/sysupgrade/nightly.manifest
fi
if [[ "$BRANCH" == "stable" ]]; then
diff --git a/modules b/modules
index 5ad9774..1ed2101 100644
--- a/modules
+++ b/modules
@@ -1,29 +1,29 @@
# This file allows specifying additional repositories to use
# when building gluon.
-# for each feed name given, add the corresponding PACKAGES_* lines
-GLUON_SITE_FEEDS='ffki ffhh roamguide eulenfunk ssidchanger button'
+# for each feed name given, add the corresponding PACKAGES_* lines
+GLUON_SITE_FEEDS='ffki sargon eulenfunk ssidchanger alt button'
-# the git repository from where to clone the package feed
+# the git repository from where to clone the package feed
PACKAGES_FFKI_REPO=git://github.com/freifunk-kiel/ffki-packages.git
-PACKAGES_FFHH_REPO=git://github.com/freifunkhamburg/ffhh-packages.git
-PACKAGES_ROAMGUIDE_REPO=https://github.com/sargon/roamguide.git
+PACKAGES_SARGON_REPO=https://github.com/sargon/gluon-sargon
PACKAGES_EULENFUNK_REPO=https://github.com/Freifunk-Nord/eulenfunk-packages
-PACKAGES_SSIDCHANGER_REPO=https://github.com/freifunk-nord/gluon-ssid-changer.git
+PACKAGES_SSIDCHANGER_REPO=https://github.com/Freifunk-Nord/gluon-ssid-changer
+PACKAGES_ALT_REPO=https://github.com/rubo77/gluon-alt-esc
PACKAGES_BUTTON_REPO=https://github.com/rubo77/ffm-packages
# the version/commit of the git repository to clone
-PACKAGES_FFKI_COMMIT=187e200c25fa1497269a3d4daa8d7b4bf6d34c47
-PACKAGES_FFHH_COMMIT=c9d083f52384c2a52c303924de3960705c7c945b
-PACKAGES_ROAMGUIDE_COMMIT=859cf67417c14ae37e3e8201f438df315651adf9
-PACKAGES_EULENFUNK_COMMIT=7d8ed92ca9501410d14f8036e7bbd9f56e638fca
-PACKAGES_SSIDCHANGER_COMMIT=4bef5af47b1a74b3cb58769634e79e237972dc3c
-PACKAGES_BUTTON_COMMIT=dc6c431b4e015791517f50d7f3eeaeb0778455b4
+PACKAGES_FFKI_COMMIT=59df8ebf69ccf5ad2ed77c5b93d59f04a0e18e10
+PACKAGES_SARGON_COMMIT=f0c35c53ee119e37081a42772ff1eb6bb2bb7133
+PACKAGES_EULENFUNK_COMMIT=a4be61c88e4628d3f039510c86cd20fe7f417261
+PACKAGES_SSIDCHANGER_COMMIT=3d15977d25d07c039680f0ace4c98c8c5223a9e9
+PACKAGES_ALT_COMMIT=796302e274495564549fd43a237552f992fd51df
+PACKAGES_BUTTON_COMMIT=48169b6d2063a6eba7212065de627012ba7add6a
# the branch to check out
-PACKAGES_FFKI_BRANCH=master
-PACKAGES_FFHH_BRANCH=master
-PACKAGES_ROAMGUIDE_BRANCH=master
-PACKAGES_EULENFUNK_BRANCH=v2016.2.x
-PACKAGES_SSIDCHANGER_BRANCH=2016.2.x
-PACKAGES_BUTTON_BRANCH=master
+PACKAGES_FFKI_BRANCH=lede
+PACKAGES_SARGON_BRANCH=master
+PACKAGES_EULENFUNK_BRANCH=lede
+PACKAGES_SSIDCHANGER_BRANCH=2017.1.x
+PACKAGES_ALT_BRANCH=master
+PACKAGES_BUTTON_BRANCH=2017.1.x
diff --git a/site.conf b/site.conf
index 80df336..3954534 100644
--- a/site.conf
+++ b/site.conf
@@ -2,17 +2,26 @@
hostname_prefix = 'Gib mir einen Namen ',
site_name = 'Freifunk Kiel',
site_code = 'ffki',
+
+ -- Must be the same of all nodes in one mesh domain
+ site_seed = 'd6c58c17e655c52c12e9d8ad1b546a264124dd33dd8a00a39ee528778c2b1c47',
opkg = {
- openwrt = 'http://opkg.services.ffki/%n/%v/%S/packages',
+ lede = 'http://opkg.services.ffki/%n/%v/%S/packages',
extra = {
- modules = 'http://opkg.services.ffki/modules/gluon-%GS-%GR/%S',
- },
+ gluon = 'http://opkg.services.ffki/modules/gluon-%GS-%GR/%S',
+ },
},
prefix4 = '10.116.128.0/17',
prefix6 = 'fda1:384a:74de:4242::/64',
+ -- alt-esc example:
+ -- extra_prefixes6 = {
+ -- '2001:db8:9::/64',
+ -- '2001:db8:100::/60',
+ -- },
+
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
ntp_servers = {'1.ntp.services.ffki'},
@@ -25,9 +34,15 @@
show_altitude = true,
},
-- define if the contact field is obligatory (optional)
- owner = {
- obligatory = true
- },
+ -- disabled in 2017.1.8
+ -- owner = {
+ -- obligatory = true
+ -- },
+ },
+
+ ddhcpd = {
+ range = "10.116.220.0/22",
+ broadcast = "10.116.255.255"
},
-- Wireless configuration for 2.4 GHz interfaces.
@@ -50,6 +65,7 @@
mesh = {
id = '16:ca:ff:ee:ba:be',
mcast_rate = 12000,
+ disabled = false,
},
},
@@ -64,12 +80,29 @@
mesh = {
id = '16:ca:ff:ee:ba:be',
mcast_rate = 12000,
+ disabled = false,
+ },
+ },
+
+ dns = {
+ cacheentries = 5000,
+ servers = {
+ 'fda1:384a:74de:4242::ff00',
+ 'fda1:384a:74de:4242::ff01',
+ 'fda1:384a:74de:4242::ff02',
+ 'fda1:384a:74de:4242::ff03',
+ 'fda1:384a:74de:4242::ff04',
+ 'fda1:384a:74de:4242::ff05',
+ 'fda1:384a:74de:4242::ff06',
+ 'fda1:384a:74de:4242::ff07',
+ 'fda1:384a:74de:4242::ff08',
},
},
-- The next node feature allows clients to always reach the node it is
-- connected to using a known IP address.
next_node = {
+ name = 'node.ffki',
-- anycast IPs of all nodes
ip4 = '10.116.254.254',
ip6 = 'fda1:384a:74de:4242::ffff',
@@ -78,13 +111,14 @@
mac = '36:f4:54:fc:e5:11'
},
- fastd_mesh_vpn = {
- -- List of crypto-methods to use.
+ mesh_vpn = {
+ enabled = true,
+ mtu = 1280,
+
+ fastd = {
methods = {'salsa2012+umac'},
-- configurable = true,
- enabled = true,
-
- mtu = 1280,
+ -- syslog_level = 'warn',
groups = {
backbone = {
-- Limit number of connected peers to reduce bandwidth.
@@ -156,12 +190,12 @@
},
},
},
- },
-
- bandwidth_limit = {
+ },
+ bandwidth_limit = {
enabled = false,
- egress = 800,
+ egress = 2000,
ingress = 4000,
+ },
},
autoupdater = {
@@ -175,9 +209,10 @@
mirrors = {
-- List of mirrors to fetch images from. IPv6 required!
'http://[fda1:384a:74de:4242::fd00]/firmware/stable/sysupgrade/',
- 'http://[fda1:384a:74de:4242::fd01]/firmware/stable/sysupgrade/',
- 'http://[fda1:384a:74de:4242::fd02]/firmware/stable/sysupgrade/',
- 'http://[fda1:384a:74de:4242::fd03]/firmware/stable/sysupgrade/',
+ 'http://[fda1:384a:74de:4242::ff00]/firmware/stable/sysupgrade/',
+ 'http://[fda1:384a:74de:4242::ff01]/firmware/stable/sysupgrade/',
+ 'http://[fda1:384a:74de:4242::ff02]/firmware/stable/sysupgrade/',
+ 'http://[fda1:384a:74de:4242::ff03]/firmware/stable/sysupgrade/',
'http://0.updates.services.ffki/firmware/stable/sysupgrade/',
'http://1.updates.services.ffki/firmware/stable/sysupgrade/',
},
@@ -198,9 +233,10 @@
name = 'nightly',
mirrors = {
'http://[fda1:384a:74de:4242::fd00]/firmware/nightly/sysupgrade/',
- 'http://[fda1:384a:74de:4242::fd01]/firmware/nightly/sysupgrade/',
- 'http://[fda1:384a:74de:4242::fd02]/firmware/nightly/sysupgrade/',
- 'http://[fda1:384a:74de:4242::fd03]/firmware/nightly/sysupgrade/',
+ 'http://[fda1:384a:74de:4242::ff00]/firmware/nightly/sysupgrade/',
+ 'http://[fda1:384a:74de:4242::ff01]/firmware/nightly/sysupgrade/',
+ 'http://[fda1:384a:74de:4242::ff02]/firmware/nightly/sysupgrade/',
+ 'http://[fda1:384a:74de:4242::ff03]/firmware/nightly/sysupgrade/',
'http://0.updates.services.ffki/firmware/nightly/sysupgrade/',
'http://1.updates.services.ffki/firmware/nightly/sysupgrade/',
},
@@ -217,45 +253,21 @@
'cb0141d79e131854eb05d6c9ce5cc237baa462e288b7fcb0eadbd92da8f34b3f', -- Buildbot Dois, AutoDeploy
},
},
-
- -- 802.11s builds are rolled out automatically whenever a commit is pushed into the exp802.11s branch
- exp11s = {
- name = '802.11s',
- mirrors = {
- 'http://[fda1:384a:74de:4242::fd00]/firmware/802.11s/sysupgrade/',
- 'http://[fda1:384a:74de:4242::fd01]/firmware/802.11s/sysupgrade/',
- 'http://[fda1:384a:74de:4242::fd02]/firmware/802.11s/sysupgrade/',
- 'http://[fda1:384a:74de:4242::fd03]/firmware/802.11s/sysupgrade/',
- 'http://0.updates.services.ffki/firmware/802.11s/sysupgrade/',
- 'http://1.updates.services.ffki/firmware/802.11s/sysupgrade/',
- },
- good_signatures = 1,
- pubkeys = {
- 'bbb814470889439c04667748c30aabf25fb800621e67544bee803fd1b342ace3', -- sargon
- '8d16e1b88bcac28b493d6eadbce97bd223a65b3282a533c1f15f4b616b0d732a', -- BenBE
- '589695821488c9acd2efc26c2fdde259b25615cbfdbb6a434e95e33fa6932023', -- Tarnatos
- '9885f836464abf3633f92701e4febeefec54f481d8b6cd39085e6ad24162ff82', -- rubo77
- '359ec3619184f1bdfe26515cf5ba2b016ba23489db2a371cbf5c3cee9d061110', -- Sven (FL)
- '622e6eccd148c4d4a53ee367dd1d73740da6795fe8dc2df1ff022bf1b4344714', -- eNBeWe
- 'a15a8f462b5d11982e2b5d36c1788ec48e328d54a736c217aa820b61faa0ad55', -- tSYS
- '1c24d4b41680f16cda0c19ad53de84ef1be3a86870e6fec6454833a6a46f7122', -- Buildbot Um, AutoDeploy
- 'cb0141d79e131854eb05d6c9ce5cc237baa462e288b7fcb0eadbd92da8f34b3f', -- Buildbot Dois, AutoDeploy
- },
- },
-
+
-- release candidate for the next stable
-- this contains only tested versions and is not rolled out automatically
rc = {
name = 'stable',
mirrors = {
'http://[fda1:384a:74de:4242::fd00]/firmware/release-candidate/sysupgrade/',
- 'http://[fda1:384a:74de:4242::fd01]/firmware/release-candidate/sysupgrade/',
- 'http://[fda1:384a:74de:4242::fd02]/firmware/release-candidate/sysupgrade/',
- 'http://[fda1:384a:74de:4242::fd03]/firmware/release-candidate/sysupgrade/',
+ 'http://[fda1:384a:74de:4242::ff00]/firmware/release-candidate/sysupgrade/',
+ 'http://[fda1:384a:74de:4242::ff01]/firmware/release-candidate/sysupgrade/',
+ 'http://[fda1:384a:74de:4242::ff02]/firmware/release-candidate/sysupgrade/',
+ 'http://[fda1:384a:74de:4242::ff03]/firmware/release-candidate/sysupgrade/',
'http://0.updates.services.ffki/firmware/release-candidate/sysupgrade/',
'http://1.updates.services.ffki/firmware/release-candidate/sysupgrade/',
},
- good_signatures = 1,
+ good_signatures = 2,
pubkeys = {
'bbb814470889439c04667748c30aabf25fb800621e67544bee803fd1b342ace3', -- sargon
'8d16e1b88bcac28b493d6eadbce97bd223a65b3282a533c1f15f4b616b0d732a', -- BenBE
@@ -270,13 +282,13 @@
},
},
},
-
+
ssid_changer = {
enabled = true,
switch_timeframe = 1440, -- only once every timeframe (in minutes) the SSID will change to OFFLINE
-- set to 1440 to change once a day
-- set to 1 minute to change every time the router gets offline
- first = 5, -- the first few minutes directly after reboot within which an Offline-SSID always may be activated (must be <= switch_timeframe)
+ first = 5, -- the first few minutes directly after reboot within which an Offline-SSID always may be activated
prefix = 'FF_Offline_', -- use something short to leave space for the nodename (no '~' allowed!)
suffix = 'nodename', -- generate the SSID with either 'nodename', 'mac' or to use only the prefix: 'none'
diff --git a/site.mk b/site.mk
index d8dafb7..872d3f5 100644
--- a/site.mk
+++ b/site.mk
@@ -1,20 +1,21 @@
GLUON_SITE_PACKAGES := \
gluon-mesh-batman-adv-14 \
+ gluon-core \
gluon-respondd \
gluon-autoupdater \
gluon-setup-mode \
+ gluon-config-mode-contact-info \
gluon-config-mode-core \
gluon-config-mode-autoupdater \
gluon-config-mode-mesh-vpn \
gluon-config-mode-geo-location \
gluon-ebtables-filter-multicast \
gluon-ebtables-filter-ra-dhcp \
- gluon-luci-admin \
- gluon-luci-autoupdater \
- gluon-luci-portconfig \
- gluon-luci-private-wifi \
- gluon-luci-wifi-config \
- gluon-next-node \
+ gluon-web-admin \
+ gluon-web-autoupdater \
+ gluon-web-network \
+ gluon-web-private-wifi \
+ gluon-web-wifi-config \
gluon-mesh-vpn-fastd \
gluon-radvd \
gluon-status-page \
@@ -23,30 +24,37 @@ GLUON_SITE_PACKAGES := \
haveged
# from sargon:
GLUON_SITE_PACKAGES += \
- roamguide
-# from ffhh-packages:
-GLUON_SITE_PACKAGES += \
- gluon-config-mode-reboot-ffhh
-# from eulenfunk-packages (branch aus Nord):
+ roamguide \
+ ddhcpd
+
+# from https://github.com/Freifunk-Nord/eulenfunk-packages
GLUON_SITE_PACKAGES += \
gluon-quickfix
+
# from https://github.com/Freifunk-Nord/gluon-ssid-changer:
GLUON_SITE_PACKAGES += \
gluon-ssid-changer
+
# from ffki-packages:
GLUON_SITE_PACKAGES += \
- gluon-config-mode-hostname-no-pretty \
- gluon-config-mode-contact-info-anonymous-hint \
- gluon-config-mode-ppa
+ gluon-config-mode-ppa \
+ gluon-config-mode-hostname-no-pretty
+# gluon-config-mode-contact-info-anonymous-hint
+
# from ffm-packages
#GLUON_SITE_PACKAGES += \
# ffffm-button-bind
# better at the bottom for only some models
+# from T-X alt-esc package:
+GLUON_SITE_PACKAGES += \
+ gluon-alt-esc-client \
+ gluon-alt-esc-provider
+
# Always call `make` from the command line with the desired release version!
# otherwise this is generated:
-DEFAULT_GLUON_RELEASE := 2016.2.7
-#DEFAULT_GLUON_RELEASE := 2016.2.7~ngly$(shell date '+%y%m%d%H%M')
+#DEFAULT_GLUON_RELEASE := 2017.1.8
+DEFAULT_GLUON_RELEASE := 2017.1.8~exp$(shell date '+%y%m%d')
# Allow overriding the release number from the command line
@@ -61,14 +69,16 @@ export GLUON_TARGET
# Region code required for some images; supported values: us eu
GLUON_REGION ?= eu
+
+# enable generation of images for ath10k devices with 802.11s mode
GLUON_ATH10K_MESH ?= 11s
GLUON_LANGS ?= en de
# basic support the USB stack
-USB_PACKAGES_BASIC := \
- kmod-usb-core \
- kmod-usb2
+#USB_PACKAGES_BASIC := \
+# kmod-usb-core \
+# kmod-usb2
# support for USB UMTS/3G devices
USB_PACKAGES_3G := \
@@ -146,7 +156,6 @@ ifeq ($(GLUON_TARGET),x86-generic)
# support the USB stack on x86 devices
# and add a few common USB NICs
GLUON_SITE_PACKAGES += \
- $(USB_PACKAGES_BASIC) \
$(USB_PACKAGES_STORAGE) \
$(USB_PACKAGES_HID) \
$(USB_PACKAGES_TETHERING) \
@@ -155,31 +164,48 @@ ifeq ($(GLUON_TARGET),x86-generic)
$(USB_X86_GENERIC_NETWORK_MODULES)
endif
+# use the target names of https://github.com/freifunk-gluon/gluon/blob/master/targets/ar71xx-generic#L163
ifeq ($(GLUON_TARGET),ar71xx-generic)
- # GLUON_TLWR710_SITE_PACKAGES := $(USB_PACKAGES_BASIC) # some wr710 versions only have 4MB
- GLUON_TLWR1043_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(USB_PACKAGES_STORAGE)
- GLUON_TLWR842_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(USB_PACKAGES_STORAGE)
- GLUON_TLWDR4300_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(USB_PACKAGES_STORAGE)
- GLUON_TLWR2543_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(USB_PACKAGES_STORAGE)
- GLUON_WRT160NL_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(USB_PACKAGES_STORAGE)
- GLUON_DIR825B1_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(USB_PACKAGES_STORAGE)
- GLUON_DIR505A1_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(USB_PACKAGES_STORAGE)
- GLUON_GLINET_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(USB_PACKAGES_STORAGE)
- GLUON_WNDR3700_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(USB_PACKAGES_STORAGE)
- GLUON_WZRHPG450H_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(USB_PACKAGES_STORAGE)
- GLUON_WZRHPAG300H_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(USB_PACKAGES_STORAGE)
- GLUON_ARCHERC7_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(USB_PACKAGES_STORAGE)
+ GLUON_tp-link-tl-wr842n-nd-v1_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
+ GLUON_tp-link-tl-wr842n-nd-v2_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
+ GLUON_tp-link-tl-wr842n-nd-v3_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
+ GLUON_tp-link-tl-wr1043n-nd-v2_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
+ GLUON_tp-link-tl-wr1043n-nd-v3_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
+ GLUON_tp-link-tl-wr1043n-nd-v4_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
+ GLUON_tp-link-tl-wdr4300-v1_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
+ GLUON_tp-link-tl-wr2543n-nd-v1_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
+ GLUON_linksys-wrt160nl_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
+ GLUON_d-link-dir-825-rev-b1_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
+ GLUON_d-link-dir-505-rev-a1_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
+ GLUON_d-link-dir-505-rev-a2_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
+ GLUON_gl-inet-6408a-v1_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
+ GLUON_gl-inet-6416a-v1_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
+ GLUON_netgear-wndr3700_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
+ GLUON_netgear-wndr3700v2_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
+ GLUON_netgear-wndr3700v4_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
+ GLUON_buffalo-wzr-hp-g450h_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
+ GLUON_buffalo-wzr-hp-g300nh_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
+ GLUON_tp-link-archer-c7-v2_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
endif
ifeq ($(GLUON_TARGET),mpc85xx-generic)
- GLUON_TLWDR4900_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(USB_PACKAGES_STORAGE)
+ GLUON_tp-link-tl-wdr4900-v1_SITE_PACKAGES := $(USB_PACKAGES_STORAGE)
endif
# from ffm-packages
ifeq ($(GLUON_TARGET),ar71xx-generic)
- GLUON_TLWR1043_SITE_PACKAGES += ffffm-button-bind
- GLUON_TLWR740_SITE_PACKAGES += ffffm-button-bind
- GLUON_TLWR741_SITE_PACKAGES += ffffm-button-bind
- GLUON_TLWR841_SITE_PACKAGES += ffffm-button-bind
- GLUON_TLWR842_SITE_PACKAGES += ffffm-button-bind
+ GLUON_tp-link-tl-wr1043n-nd-v2_SITE_PACKAGES += ffffm-button-bind
+ GLUON_tp-link-tl-wr1043n-nd-v3_SITE_PACKAGES += ffffm-button-bind
+ GLUON_tp-link-tl-wr1043n-nd-v4_SITE_PACKAGES += ffffm-button-bind
+ GLUON_tp-link-tl-wr1043n-v5_SITE_PACKAGES += ffffm-button-bind
+ GLUON_tp-link-tl-wr841n-nd-v5_SITE_PACKAGES += ffffm-button-bind
+ GLUON_tp-link-tl-wr841n-nd-v7_SITE_PACKAGES += ffffm-button-bind
+ GLUON_tp-link-tl-wr841n-nd-v8_SITE_PACKAGES += ffffm-button-bind
+ GLUON_tp-link-tl-wr841n-nd-v9_SITE_PACKAGES += ffffm-button-bind
+ GLUON_tp-link-tl-wr841n-nd-v10_SITE_PACKAGES += ffffm-button-bind
+ GLUON_tp-link-tl-wr841n-nd-v11_SITE_PACKAGES += ffffm-button-bind
+ GLUON_tp-link-tl-wr841n-nd-v12_SITE_PACKAGES += ffffm-button-bind
+ GLUON_tp-link-tl-wr842n-nd-v1_SITE_PACKAGES += ffffm-button-bind
+ GLUON_tp-link-tl-wr842n-nd-v2_SITE_PACKAGES += ffffm-button-bind
+ GLUON_tp-link-tl-wr842n-nd-v3_SITE_PACKAGES += ffffm-button-bind
endif
diff --git a/tests/validate_site.sh b/tests/validate_site.sh
index bf374e2..d3bb2c8 100644..100755
--- a/tests/validate_site.sh
+++ b/tests/validate_site.sh
@@ -1,14 +1,14 @@
#!/bin/bash
# validate_site.sh checks if the site.conf is valid json
-GLUON_BRANCH='v2016.2.7'
+GLUON_BRANCH='v2017.1.8'
P=$(pwd)
echo "####### validating $P/site.conf ..."
GLUON_SITEDIR="." lua5.1 tests/site_config.lua
echo "####### validating $P/make-release.sh ..."
-bash -n $P/make-release.sh
+bash -n $P/make-release.sh
echo "####### validating $P/modules ..."
source $P/modules
@@ -17,7 +17,7 @@ rm -Rf $testpath
mkdir -p $testpath/packages
cd $testpath/packages
for feed in $GLUON_SITE_FEEDS; do
- echo "checking PACKAGES_${feed^^}_REPO ..."
+ echo "####### checking PACKAGES_${feed^^}_REPO ..."
repo_var=$(echo PACKAGES_${feed^^}_REPO)
commit_var=$(echo PACKAGES_${feed^^}_COMMIT)
branch_var=$(echo PACKAGES_${feed^^}_BRANCH)
@@ -57,8 +57,7 @@ echo "####### validating GLUON_SITE_PACKAGES from $P/site.mk ..."
# ignore standard packages:
sed '/GLUON_RELEASE/,$d' $P/site.mk | egrep -v '(#|G|iwinfo|iptables|haveged)'> $testpath/site.mk.sh
sed -i 's/\s\\$//g;/^$/d' $testpath/site.mk.sh
-# in lede this will be needed:
-# sed -i 's/gluon-mesh-batman-adv-1[45]/gluon-mesh-batman-adv/g' $testpath/site.mk.sh
+sed -i 's/gluon-mesh-batman-adv-1[45]/gluon-mesh-batman-adv/g' $testpath/site.mk.sh
cat $testpath/site.mk.sh |
while read packet; do
if [ "$packet" != "" ]; then