Stabile Version 0.9 basierend auf Gluon 2016.2.6

freifunk-pinneberg · Jul 27, 2017 · c2a2c39 · c2a2c39
1 parent b601225
commit c2a2c39
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -20,14 +20,18 @@ Unter Debian ist das beispielsweise:
 
 ### Firmware bauen
     make update
-    make -j10 GLUON_TARGET=ar71xx-generic
+    make -j10 GLUON_TARGET=ar71xx-generic GLUON_BRANCH=stable
 
 Über den Parameter **j** passt man die anzahl der Threads an. Es empfiehlt sich hier so viele anzugeben wie die CPU Kerne hat.
 Über **GLUON_TARGET** definiert man die Zielplattform, möglich Angaben sind derzeit:
 
 * ar71xx-generic - Fast alle Router
 * mpc85xx-generic - TLWDR4900
 * ar71xx-nand - WNDR4300
+* brcm2708-bcm2708 - Raspberry 1
+* brcm2708-bcm2709 - Raspberry 2
 * x86-generic - Klassischer PC (32bit)
 * x86-64 - Klassischer PC (64bit)
 * x86-kvm_guest - Viretuelle Maschienen
+
+Die Angabe von **GLUON_BRANCH** bewirkt, daß der Autoupdater aktiviert wird.
diff --git a/i18n/de.po b/i18n/de.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: FFPI 1.0\n"
-"PO-Revision-Date: 2016-10-20 19:18+0100\n"
+"Project-Id-Version: FFPI 1.2\n"
+"PO-Revision-Date: 2017-07-23 11:06+0100\n"
 "Last-Translator: Thomas Hooge <thomas@hoogi.de>\n"
 "Language-Team: German\n"
 "Language: de\n"

diff --git a/i18n/en.po b/i18n/en.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: FFPI 1.0\n"
-"PO-Revision-Date: 2016-10-20 19:18+0100\n"
+"Project-Id-Version: FFPI 1.2\n"
+"PO-Revision-Date: 2017-07-23 11:06+0100\n"
 "Last-Translator: Thomas Hooge <thomas@hoogi.de>\n"
 "Language-Team: English\n"
 "Language: en\n"

diff --git a/site.conf b/site.conf
@@ -5,7 +5,7 @@
     opkg = {
         openwrt = 'http://1.download.services.ffpi/openwrt/%n/%v/%S/packages',
         extra = {
-            modules = 'http://1.download.services.ffpi/experimental/modules/gluon-%GS-%GR/%S',
+            modules = 'http://1.download.services.ffpi/stable/modules/gluon-%GS-%GR/%S',
         },
     },
     prefix4 = '10.137.0.0/16',
@@ -90,7 +90,7 @@
         }
     },
     autoupdater = {
-        branch = 'experimental',
+        branch = 'stable',
         branches = {
             stable = {
                 name = 'stable',

diff --git a/site.mk b/site.mk
@@ -103,7 +103,7 @@ GLUON_SITE_PACKAGES += \
     $(USB_PACKAGES_STORAGE)
 endif
 
-DEFAULT_GLUON_RELEASE := 0.9+exp$(shell date '+%Y%m%d')
+DEFAULT_GLUON_RELEASE := 0.9
 
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)