From 60f30382209ffc050baa82be9bad3622a1d88d5b Mon Sep 17 00:00:00 2001 From: Daniel Frank Date: Fri, 26 Jan 2018 20:49:19 +0100 Subject: [PATCH] v0.9.0-stable --- README.md | 24 ++++++++++++++++-------- config/defaults.erb | 4 ++-- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 5f50e56..cebcf2d 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,27 @@ #### How to build the Freifunk Hamburg Firmware - git clone https://github.com/freifunk-gluon/gluon.git # Get the official Gluon repository - cd gluon - git clone https://github.com/freifunkhamburg/site-ffhh.git site # Get the Freifunk Hamburg site repository - cd site - make SITE=ffhh - cd .. - make update # Get other repositories used by Gluon - make # Build Gluon + $ git clone -b v2017.1.x https://github.com/freifunk-gluon/gluon.git + $ git clone -b v0.9.0 https://github.com/freifunkhamburg/site-ffhh.git + $ cd site-ffhh + + To build all domains into the subdirectory firmware: + $ ./build -g ../gluon -o firmware + To build a specific domain (for example ffhh-nowe) into the subdirectory firmware: + $ ./build -g ../gluon -l ffhh-nowe -o firmware + To build two specific domains (for example ffhh-nowe and ffhh-sued) into the subdirectory firmware: + $ ./build -g ../gluon -l ffhh-nowe,ffhh-sued -o firmware + + The build.sh supports the argument -b if you wish to also build firmware images marked as broken in gluon. Please see [the official Gluon repository](https://github.com/freifunk-gluon/gluon) for an in-depth explanation of the build process. #### Gluon versions used for specific Hamburg Freifunk Firmware builds +- 0.9.0: site-ffhh: xxx, gluon: v2017.1.x (9295abcea7b016b0fe4b05c534ea0731b48ef593) +- 0.8.6: v2016.2.7 Fix gw01-new key, add 3.ntp.services.ffhh to NTP servers, add Firmware signing keys for Alexander and Olli, remove old domain +- 0.8.5: v2016.2.7 Domain split, new package: ffho-ebtables-net-rules +- 0.8.4: v2016.2.7 (updated openwrt/package/network/services/dnsmasq/Makefile: PKG\_VERSION:=2.78 & PKG\_MD5SUM:=6d0241b72c79d2b510776ccc4ed69ca4) - 0.8.3: v2016.2.6 (ffhh-sued only) - 0.8.2: v2016.2.5 - 0.8.1: v2016.2.4 (ffhh-sued only) diff --git a/config/defaults.erb b/config/defaults.erb index da87eb1..d58e332 100644 --- a/config/defaults.erb +++ b/config/defaults.erb @@ -1,6 +1,6 @@ <% -#gluon_branch = "stable" -gluon_branch = "experimental" +gluon_branch = "stable" +#gluon_branch = "experimental" gluon_release = "0.9.0" # Add the +exp and current date if this is an experimental release