From 2bd0396c03d062feb7152987d8b2c9d503e65cb9 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 6 Aug 2018 19:57:33 +0200
Subject: [PATCH 01/75] Update targets
---
config/defaults.erb | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/config/defaults.erb b/config/defaults.erb
index 686dc26..5cff607 100644
--- a/config/defaults.erb
+++ b/config/defaults.erb
@@ -8,15 +8,21 @@ gluon_release += "~exp" + Time.new.strftime("%Y%m%d") if gluon_branch == "experi
gluon_targets = %w(
ar71xx-generic
- ar71xx-tiny
ar71xx-nand
+ ar71xx-tiny
brcm2708-bcm2708
brcm2708-bcm2709
+ ipq40xx
+ ipq806x
mpc85xx-generic
+ ramips-mt7620
ramips-mt7621
+ ramips-mt76x8
+ ramips-rt305x
+ sunxi-cortexa7
+ x86-64
x86-generic
x86-geode
- x86-64
)
# Add more targets if broken images are included...
@@ -24,12 +30,7 @@ if ENV["BROKEN"]
gluon_targets += %w(
ar71xx-mikrotik
brcm2708-bcm2710
- ipq806x
- mvebu
- ramips-mt7620
- ramips-mt7628
- ramips-rt305x
- sunxi
+ mvebu-cortexa9
)
end
gluon_targets.sort!.uniq!
From dc5cc9eb694b41719a5cfbe0537aef79a61b810d Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Tue, 28 Aug 2018 21:41:53 +0200
Subject: [PATCH 02/75] =?UTF-8?q?Update=20f=C3=BCr=20Gluon=20v2018.1.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 3 ++-
config/defaults.erb | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 59d578f..be0254a 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,8 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
#### Gluon versions used for specific Hamburg Freifunk Firmware builds
-- v2018.1.0.0: site-ffhh: v2018.1.0.0, gluon: v2018.1
+- v2018.1.1.0: site-ffhh: v2018.1.1.0, gluon: v2018.1.1
+- v2018.1.0.0: site-ffhh: v2018.1.0.0, gluon: v2018.1 (never rolled out due to issues with the auto updater in gluon)
- 0.9.2: site-ffhh: v0.9.2, gluon: v2017.1.8
- 0.9.1: site-ffhh: v0.9.1, gluon: v2017.1.5
- 0.9.0: site-ffhh: 60f30382209ffc050baa82be9bad3622a1d88d5b, gluon: v2017.1.x (9295abcea7b016b0fe4b05c534ea0731b48ef593) (never rolled out due to 0.9.1)
diff --git a/config/defaults.erb b/config/defaults.erb
index 5cff607..bcb4a45 100644
--- a/config/defaults.erb
+++ b/config/defaults.erb
@@ -1,7 +1,7 @@
<%
gluon_branch = "stable"
#gluon_branch = "experimental"
-gluon_release = "v2018.1.0.0"
+gluon_release = "v2018.1.1.0"
# Add the +exp and current date if this is an experimental release
gluon_release += "~exp" + Time.new.strftime("%Y%m%d") if gluon_branch == "experimental"
From c1f2d4ec37da7b8c1e33092396ddeff5adce2c11 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Tue, 28 Aug 2018 23:41:02 +0200
Subject: [PATCH 03/75] =?UTF-8?q?Targets=20f=C3=BCr=20v2018.1.1.0=20aktual?=
=?UTF-8?q?isieren?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/defaults.erb | 33 +++++++++++++++++----------------
1 file changed, 17 insertions(+), 16 deletions(-)
diff --git a/config/defaults.erb b/config/defaults.erb
index bcb4a45..5671fe2 100644
--- a/config/defaults.erb
+++ b/config/defaults.erb
@@ -7,22 +7,21 @@ gluon_release = "v2018.1.1.0"
gluon_release += "~exp" + Time.new.strftime("%Y%m%d") if gluon_branch == "experimental"
gluon_targets = %w(
- ar71xx-generic
- ar71xx-nand
- ar71xx-tiny
- brcm2708-bcm2708
- brcm2708-bcm2709
- ipq40xx
- ipq806x
- mpc85xx-generic
- ramips-mt7620
- ramips-mt7621
- ramips-mt76x8
- ramips-rt305x
- sunxi-cortexa7
- x86-64
- x86-generic
- x86-geode
+ ar71xx-generic
+ ar71xx-tiny
+ ar71xx-nand
+ brcm2708-bcm2708
+ brcm2708-bcm2709
+ mpc85xx-generic
+ ramips-mt7621
+ sunxi
+ x86-generic
+ x86-geode
+ x86-64
+ ipq806x
+ ramips-mt7620
+ ramips-mt7628
+ ramips-rt305x
)
# Add more targets if broken images are included...
@@ -30,7 +29,9 @@ if ENV["BROKEN"]
gluon_targets += %w(
ar71xx-mikrotik
brcm2708-bcm2710
+ ipq40xx
mvebu-cortexa9
+ ramips-mt7620
)
end
gluon_targets.sort!.uniq!
From 7e94b11623249edf521afcdc1629d0557b2dfd92 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Thu, 30 Aug 2018 19:03:18 +0200
Subject: [PATCH 04/75] =?UTF-8?q?Targets=20f=C3=BCr=20v2018.1.1.0-exp=20ak?=
=?UTF-8?q?tualisieren?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/defaults.erb | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/config/defaults.erb b/config/defaults.erb
index 5671fe2..ee95038 100644
--- a/config/defaults.erb
+++ b/config/defaults.erb
@@ -24,14 +24,27 @@ gluon_targets = %w(
ramips-rt305x
)
-# Add more targets if broken images are included...
+# Targets to build if possibly broken or untested images are included
if ENV["BROKEN"]
- gluon_targets += %w(
+ gluon_targets = %w(
+ ar71xx-generic
ar71xx-mikrotik
+ ar71xx-nand
+ ar71xx-tiny
+ brcm2708-bcm2708
+ brcm2708-bcm2709
brcm2708-bcm2710
- ipq40xx
- mvebu-cortexa9
+ ipq806x
+ mpc85xx-generic
+ mvebu
ramips-mt7620
+ ramips-mt7621
+ ramips-mt7628
+ ramips-rt305x
+ sunxi
+ x86-64
+ x86-generic
+ x86-geode
)
end
gluon_targets.sort!.uniq!
From af558e46767f4f71ef1165399dc87e5f9e8ae656 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 7 Sep 2018 21:07:51 +0200
Subject: [PATCH 05/75] build.sh: Allow specifying the gluon targets that
should be built
---
build.sh | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/build.sh b/build.sh
index 2f8f21a..56da0ec 100755
--- a/build.sh
+++ b/build.sh
@@ -8,6 +8,7 @@ function usage () {
echo "Usage: $0 -g GLUON_PATH" >&2
echo " -g GLUON_PATH Path to a checkout of the gluon repository." >&2
echo " -l SITES Comma separated list of sites to build" >&2
+ echo " -t TARGETS Comma separated list of gluon targets to build" >&2
echo " -o OUT_PATH Path to the firmware output directory. Default: ${gluon_out}" >&2
echo " -s SIGNATURE Sign firmware with signature" >&2
echo " -u UPLOADSCRIPT Run UPLOADSCRIPT after building. Will be run with one argument: $gluon_out/<GLUON_RELEASE>" >&2
@@ -30,6 +31,10 @@ while [ $# -gt 0 ]; do
sites="$2"
shift
;;
+ -t)
+ build_targets="$2"
+ shift
+ ;;
-o)
gluon_out="$2"
shift
@@ -84,6 +89,8 @@ fi
. ./info
export GLUON_RELEASE
export GLUON_BRANCH
+# if a list of build targets has been supplied, only build those
+targets="$(echo "${build_targets:-$targets}" | sed -e 's_,_ _g')"
# get the available sites...
sites="$(echo "$sites" | sed -e 's_,_ _g')"
if [ "$sites" == "" ]; then
From 2f528b1c448b6d6feaff6d83da5590f163ab9e77 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 21 Sep 2018 19:51:50 +0200
Subject: [PATCH 06/75] =?UTF-8?q?Targets=20f=C3=BCr=20Gluon=20master=20set?=
=?UTF-8?q?zen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/defaults.erb | 52 +++++++++++++++++----------------------------
1 file changed, 19 insertions(+), 33 deletions(-)
diff --git a/config/defaults.erb b/config/defaults.erb
index ee95038..bcb4a45 100644
--- a/config/defaults.erb
+++ b/config/defaults.erb
@@ -7,44 +7,30 @@ gluon_release = "v2018.1.1.0"
gluon_release += "~exp" + Time.new.strftime("%Y%m%d") if gluon_branch == "experimental"
gluon_targets = %w(
- ar71xx-generic
- ar71xx-tiny
- ar71xx-nand
- brcm2708-bcm2708
- brcm2708-bcm2709
- mpc85xx-generic
- ramips-mt7621
- sunxi
- x86-generic
- x86-geode
- x86-64
- ipq806x
- ramips-mt7620
- ramips-mt7628
- ramips-rt305x
+ ar71xx-generic
+ ar71xx-nand
+ ar71xx-tiny
+ brcm2708-bcm2708
+ brcm2708-bcm2709
+ ipq40xx
+ ipq806x
+ mpc85xx-generic
+ ramips-mt7620
+ ramips-mt7621
+ ramips-mt76x8
+ ramips-rt305x
+ sunxi-cortexa7
+ x86-64
+ x86-generic
+ x86-geode
)
-# Targets to build if possibly broken or untested images are included
+# Add more targets if broken images are included...
if ENV["BROKEN"]
- gluon_targets = %w(
- ar71xx-generic
+ gluon_targets += %w(
ar71xx-mikrotik
- ar71xx-nand
- ar71xx-tiny
- brcm2708-bcm2708
- brcm2708-bcm2709
brcm2708-bcm2710
- ipq806x
- mpc85xx-generic
- mvebu
- ramips-mt7620
- ramips-mt7621
- ramips-mt7628
- ramips-rt305x
- sunxi
- x86-64
- x86-generic
- x86-geode
+ mvebu-cortexa9
)
end
gluon_targets.sort!.uniq!
From fa474b7a7dae02be4235e5441b2e4b6fcb64bfbf Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Sun, 23 Sep 2018 23:21:05 +0200
Subject: [PATCH 07/75] Set config_mode options for hostname
---
template/site.conf.erb | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/template/site.conf.erb b/template/site.conf.erb
index a2a83f6..024df96 100644
--- a/template/site.conf.erb
+++ b/template/site.conf.erb
@@ -1,5 +1,11 @@
{
hostname_prefix = 'GibMirEinenNamen',
+ config_mode = {
+ hostname = {
+ optional = false,
+ prefill = true,
+ },
+ },
site_name = '<%= site_name %>',
site_code = '<%= site_code %>',
domain_seed = '<%= (site_code + ("Hamburg" * 7))[0..31].each_byte.map { |b| b.to_s(16) }.join.upcase %>',
From 86637d726275e9710b66cf0f4df60523621755fe Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 24 Sep 2018 21:42:39 +0200
Subject: [PATCH 08/75] Migration zu Gluon Features
---
config/defaults.erb | 25 -------------------------
config/ffhh-nowe.erb | 2 --
config/ffhh-ost.erb | 2 --
config/ffhh-sued.erb | 2 --
config/ffhh-west.erb | 2 --
template/site.mk.erb | 21 ++++++++++++++++++---
6 files changed, 18 insertions(+), 36 deletions(-)
diff --git a/config/defaults.erb b/config/defaults.erb
index bcb4a45..9d3236a 100644
--- a/config/defaults.erb
+++ b/config/defaults.erb
@@ -35,31 +35,6 @@ if ENV["BROKEN"]
end
gluon_targets.sort!.uniq!
-gluon_site_packages = %w(
- gluon-autoupdater
- gluon-config-mode-autoupdater
- gluon-config-mode-core
- gluon-config-mode-hostname
- gluon-config-mode-mesh-vpn
- gluon-ebtables-filter-multicast
- gluon-ebtables-filter-ra-dhcp
- gluon-ebtables-source-filter
- gluon-mesh-batman-adv-15
- gluon-mesh-vpn-fastd
- gluon-radvd
- gluon-respondd
- gluon-setup-mode
- gluon-status-page
- gluon-web-admin
- gluon-web-autoupdater
- gluon-web-network
- gluon-web-private-wifi
- gluon-web-wifi-config
- haveged
- iptables
- iwinfo
-)
-
signing_keys = [
'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', # leo
'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', # andre
diff --git a/config/ffhh-nowe.erb b/config/ffhh-nowe.erb
index 92b157d..39f6aec 100644
--- a/config/ffhh-nowe.erb
+++ b/config/ffhh-nowe.erb
@@ -2,8 +2,6 @@
site_name = 'Freifunk Hamburg Nordwest'
site_code = 'ffhh-nowe'
-gluon_site_packages += %w( )
-
prefix4 = '10.112.192.0/19'
prefix6 = '2a03:2267:3::/64'
diff --git a/config/ffhh-ost.erb b/config/ffhh-ost.erb
index 1cb7b72..8539b32 100644
--- a/config/ffhh-ost.erb
+++ b/config/ffhh-ost.erb
@@ -2,8 +2,6 @@
site_name = 'Freifunk Hamburg Ost'
site_code = 'ffhh-ost'
-gluon_site_packages += %w( )
-
prefix4 = '10.112.224.0/19'
prefix6 = '2a03:2267:4::/64'
diff --git a/config/ffhh-sued.erb b/config/ffhh-sued.erb
index b970c9c..2f76b16 100644
--- a/config/ffhh-sued.erb
+++ b/config/ffhh-sued.erb
@@ -2,8 +2,6 @@
site_name = 'Freifunk Hamburg Sued'
site_code = 'ffhh-sued'
-gluon_site_packages += %w( )
-
prefix4 = '10.112.64.0/19'
prefix6 = '2a03:2267:1::/64'
diff --git a/config/ffhh-west.erb b/config/ffhh-west.erb
index b9775de..aaf5399 100644
--- a/config/ffhh-west.erb
+++ b/config/ffhh-west.erb
@@ -2,8 +2,6 @@
site_name = 'Freifunk Hamburg West'
site_code = 'ffhh-west'
-gluon_site_packages += %w( )
-
prefix4 = '10.112.96.0/19'
prefix6 = '2a03:2267:2::/64'
diff --git a/template/site.mk.erb b/template/site.mk.erb
index b5fa761..facd7d8 100644
--- a/template/site.mk.erb
+++ b/template/site.mk.erb
@@ -1,7 +1,22 @@
-GLUON_SITE_PACKAGES :=<% gluon_site_packages.each do | p | -%>
-<%= " " + p -%>
-<% end -%>
+GLUON_SITE_PACKAGES := -gluon-config-mode-geo-location \
+ -gluon-config-mode-contact-info \
+ gluon-ebtables-source-filter \
+ haveged \
+ iptables \
+ iwinfo
+GLUON_FEATURES := \
+ autoupdater \
+ ebtables-filter-multicast \
+ ebtables-filter-ra-dhcp \
+ ebtables-limit-arp \
+ mesh-batman-adv-15 \
+ mesh-vpn-fastd \
+ radvd \
+ respondd \
+ status-page \
+ web-advanced \
+ web-wizard
# EXTRA_SOFTWARE_TOOLS_01
EXTRA_SOFTWARE_TOOLS_01 := \
From 7161a0bc69fdcc3b4e08e44ec07e6739bbcd3cb1 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 28 Sep 2018 20:00:36 +0200
Subject: [PATCH 09/75] Eingabe eines Knotennamens erzwingen
---
template/site.conf.erb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/template/site.conf.erb b/template/site.conf.erb
index 024df96..cb8c9c0 100644
--- a/template/site.conf.erb
+++ b/template/site.conf.erb
@@ -3,7 +3,7 @@
config_mode = {
hostname = {
optional = false,
- prefill = true,
+ prefill = false,
},
},
site_name = '<%= site_name %>',
From bd5ba8ca40d7887b9bb1e8e7bb90fa19b38388b6 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 28 Sep 2018 20:55:08 +0200
Subject: [PATCH 10/75] Neues Paket: gluon-web-mesh-vpn-fastd
---
template/site.mk.erb | 1 +
1 file changed, 1 insertion(+)
diff --git a/template/site.mk.erb b/template/site.mk.erb
index facd7d8..2b4b7de 100644
--- a/template/site.mk.erb
+++ b/template/site.mk.erb
@@ -1,6 +1,7 @@
GLUON_SITE_PACKAGES := -gluon-config-mode-geo-location \
-gluon-config-mode-contact-info \
gluon-ebtables-source-filter \
+ gluon-web-mesh-vpn-fastd \
haveged \
iptables \
iwinfo
From e59d96d6dd42f74fa206ba950b04ec6c8311fa1f Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 1 Oct 2018 21:37:30 +0200
Subject: [PATCH 11/75] Umbau auf Multi-Domain firmware
---
Makefile | 31 --------
build.conf | 3 +
build.sh | 88 +++++++---------------
config/defaults.erb | 51 -------------
config/ffhh-nowe.erb | 39 ----------
config/ffhh-ost.erb | 39 ----------
config/ffhh-sued.erb | 39 ----------
config/ffhh-west.erb | 39 ----------
domains/ffhh_nowe.conf | 72 ++++++++++++++++++
domains/ffhh_ost.conf | 72 ++++++++++++++++++
domains/ffhh_sued.conf | 72 ++++++++++++++++++
domains/ffhh_west.conf | 72 ++++++++++++++++++
template/modules.erb => modules | 0
site.conf | 105 ++++++++++++++++++++++++++
template/site.mk.erb => site.mk | 12 +--
template/info.erb | 3 -
template/site.conf.erb | 128 --------------------------------
17 files changed, 428 insertions(+), 437 deletions(-)
delete mode 100644 Makefile
create mode 100644 build.conf
delete mode 100644 config/defaults.erb
delete mode 100644 config/ffhh-nowe.erb
delete mode 100644 config/ffhh-ost.erb
delete mode 100644 config/ffhh-sued.erb
delete mode 100644 config/ffhh-west.erb
create mode 100644 domains/ffhh_nowe.conf
create mode 100644 domains/ffhh_ost.conf
create mode 100644 domains/ffhh_sued.conf
create mode 100644 domains/ffhh_west.conf
rename template/modules.erb => modules (100%)
create mode 100644 site.conf
rename template/site.mk.erb => site.mk (83%)
delete mode 100644 template/info.erb
delete mode 100644 template/site.conf.erb
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 08c41b8..0000000
--- a/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-sites: clean info sites/ffhh-nowe sites/ffhh-ost sites/ffhh-sued sites/ffhh-west
-
-info: config/defaults.erb template/info.erb
- erb -T- config/defaults.erb template/$@.erb >$@
-
-.PHONY: clean
-clean:
- rm -rf sites
- rm -f info
-
-sites/%: config/%.erb
- mkdir -p $@
- cd $@ && $(MAKE) -f ../../Makefile site SITE=$(@F)
-
-site: siteclean site.mk site.conf modules i18n
-
-.PHONY: siteclean
-siteclean:
- rm -f site.mk site.conf modules
-
-modules:
- erb -T- ../../config/defaults.erb ../../config/$(SITE).erb ../../template/$@.erb >$@
-
-site.conf:
- erb -T- ../../config/defaults.erb ../../config/$(SITE).erb ../../template/$@.erb >$@
-
-site.mk:
- erb -T- ../../config/defaults.erb ../../config/$(SITE).erb ../../template/$@.erb >$@
-
-i18n:
- ln -s ../../i18n
diff --git a/build.conf b/build.conf
new file mode 100644
index 0000000..84afa92
--- /dev/null
+++ b/build.conf
@@ -0,0 +1,3 @@
+GLUON_RELEASE="master~201810011"
+GLUON_BRANCH="experimental"
+targets="ar71xx-generic ar71xx-nand ar71xx-tiny brcm2708-bcm2708 brcm2708-bcm2709 ipq40xx ipq806x mpc85xx-generic ramips-mt7620 ramips-mt7621 ramips-mt76x8 ramips-rt305x sunxi-cortexa7 x86-64 x86-generic x86-geode"
diff --git a/build.sh b/build.sh
index 56da0ec..5a4bbe6 100755
--- a/build.sh
+++ b/build.sh
@@ -7,13 +7,10 @@ function announce () {
function usage () {
echo "Usage: $0 -g GLUON_PATH" >&2
echo " -g GLUON_PATH Path to a checkout of the gluon repository." >&2
- echo " -l SITES Comma separated list of sites to build" >&2
echo " -t TARGETS Comma separated list of gluon targets to build" >&2
echo " -o OUT_PATH Path to the firmware output directory. Default: ${gluon_out}" >&2
echo " -s SIGNATURE Sign firmware with signature" >&2
- echo " -u UPLOADSCRIPT Run UPLOADSCRIPT after building. Will be run with one argument: $gluon_out/<GLUON_RELEASE>" >&2
echo " -b BROKEN=1" >&2
- echo " -m Do not regenerate the sites" >&2
echo " -v verbose" >&2
echo " -j JOBS Run build with -jJOBS. Default: ${proc}" >&2
}
@@ -27,10 +24,6 @@ while [ $# -gt 0 ]; do
gluon_path="$2"
shift
;;
- -l)
- sites="$2"
- shift
- ;;
-t)
build_targets="$2"
shift
@@ -43,16 +36,9 @@ while [ $# -gt 0 ]; do
signature="$2"
shift
;;
- -u)
- uploadscript="$2"
- shift
- ;;
-b)
export BROKEN=1
;;
- -m)
- dont_make_sites=1
- ;;
-j)
proc="$2"
shift
@@ -61,6 +47,7 @@ while [ $# -gt 0 ]; do
verbose=V=s
;;
*)
+ echo ERROR: Failed to parse: "${1}" >&2
usage
exit 1
;;
@@ -81,61 +68,42 @@ announce GLUON: $gluon_path >&2
announce FFHH SITE PATH: $site_path >&2
pushd $site_path
-if [ "$dont_make_sites" == "" ]; then
- # Build the site repo and generate all site configs
- announce Building site repo and reading data >&2
- make
-fi
-. ./info
+. ./build.conf
export GLUON_RELEASE
export GLUON_BRANCH
# if a list of build targets has been supplied, only build those
targets="$(echo "${build_targets:-$targets}" | sed -e 's_,_ _g')"
-# get the available sites...
-sites="$(echo "$sites" | sed -e 's_,_ _g')"
-if [ "$sites" == "" ]; then
- for s in sites/*; do sites="${sites} ${s##*/}"; done
-fi
-announce Gluon will be built for the following sites:$sites >&2
announce The following targets will be generated: $targets >&2
popd
pushd "${gluon_path}"
announce Starting make update...
-for s in $sites; do
- export GLUON_SITEDIR="${site_path}/sites/${s}"
- export GLUON_OUTPUTDIR="${gluon_out}/${GLUON_RELEASE}/${GLUON_BRANCH}/${s}"
- rm -rf "${GLUON_OUTPUTDIR}"
- mkdir -p "${GLUON_OUTPUTDIR}"
- make update
- # Try to install patches. I wasn't able to figure out how patches in gluon/site/patches work.
- for p in ${site_path}/patches/*.patch; do
- if [ -e "$p" -a ! -f "${gluon_path}/${p##*/}" ]; then
- announce Installing patch $p
- patch -p1 < $p
- touch "${gluon_path}/${p##*/}"
- fi
- done
- for t in $targets; do
- announce make clean for $s/$t... >&2
- make -j1 clean GLUON_TARGET=$t
- announce Starting build for $s/$t... >&2
- make -j$(nproc) GLUON_TARGET=$t $verbose
- done
- announce Building manifest...
- make manifest
- if [ -n "${signature}" ]; then
- if [ "$GLUON_BRANCH" == "experimental" ]; then
- announce Signing
- "${gluon_path}/contrib/sign.sh" "${signature}" "${GLUON_OUTPUTDIR}/images/sysupgrade/experimental.manifest"
- else
- echo ERROR: can only sign experimental branch >&2
- exit 1
- fi
+export GLUON_SITEDIR="${site_path}"
+export GLUON_OUTPUTDIR="${gluon_out}/${GLUON_RELEASE}/${GLUON_BRANCH}"
+rm -rf "${GLUON_OUTPUTDIR}"
+mkdir -p "${GLUON_OUTPUTDIR}"
+make update
+# Try to install patches. I wasn't able to figure out how patches in gluon/site/patches work.
+for p in ${site_path}/patches/*.patch; do
+ if [ -e "$p" -a ! -f "${gluon_path}/${p##*/}" ]; then
+ announce Installing patch $p
+ patch -p1 < $p
+ touch "${gluon_path}/${p##*/}"
fi
done
-popd
-if [ -n "$uploadscript" ]; then
- announce Starting upload. Executing: $uploadscript $gluon_out/$GLUON_RELEASE
- "$uploadscript" "$gluon_out/$GLUON_RELEASE"
+for t in $targets; do
+ announce Starting build for $t... >&2
+ make -j$(nproc) GLUON_TARGET=$t $verbose
+done
+announce Building manifest...
+make manifest
+if [ -n "${signature}" ]; then
+ if [ "$GLUON_BRANCH" == "experimental" ]; then
+ announce Signing...
+ "${gluon_path}/contrib/sign.sh" "${signature}" "${GLUON_OUTPUTDIR}/images/sysupgrade/experimental.manifest"
+ else
+ echo ERROR: can only sign experimental branch >&2
+ exit 1
+ fi
fi
+popd
diff --git a/config/defaults.erb b/config/defaults.erb
deleted file mode 100644
index 9d3236a..0000000
--- a/config/defaults.erb
+++ /dev/null
@@ -1,51 +0,0 @@
-<%
-gluon_branch = "stable"
-#gluon_branch = "experimental"
-gluon_release = "v2018.1.1.0"
-
-# Add the +exp and current date if this is an experimental release
-gluon_release += "~exp" + Time.new.strftime("%Y%m%d") if gluon_branch == "experimental"
-
-gluon_targets = %w(
- ar71xx-generic
- ar71xx-nand
- ar71xx-tiny
- brcm2708-bcm2708
- brcm2708-bcm2709
- ipq40xx
- ipq806x
- mpc85xx-generic
- ramips-mt7620
- ramips-mt7621
- ramips-mt76x8
- ramips-rt305x
- sunxi-cortexa7
- x86-64
- x86-generic
- x86-geode
-)
-
-# Add more targets if broken images are included...
-if ENV["BROKEN"]
- gluon_targets += %w(
- ar71xx-mikrotik
- brcm2708-bcm2710
- mvebu-cortexa9
- )
-end
-gluon_targets.sort!.uniq!
-
-signing_keys = [
- 'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', # leo
- '3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', # andre
- '1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', # gernot
- 'bd5a70d4c3df30eaa860d615c0e0526b0dda5bc60c09c20972bce4ffa7512659', # bjoern
- 'd9992853c0fe1a2e983cc222b6bd26e70d4fb2a53862ac099144e9e8142238d0', # daniel
- '961495a04512e5ba1843fd3c216d8af6ef2fdb19f93055142803e2da26d670b9', # alexander
- 'ed6278f168f0382adf4f058cb9c31d8f1145abb968a8626045de7d6d87a0be40', # olli
-]
-signing_keys_experimental = [
- '1a0112fe489860068480c611c5dc56196c2f1a645db651ea2ed19ae0f0e8e1d1', # 1.builder
-]
-
--%>
diff --git a/config/ffhh-nowe.erb b/config/ffhh-nowe.erb
deleted file mode 100644
index 39f6aec..0000000
--- a/config/ffhh-nowe.erb
+++ /dev/null
@@ -1,39 +0,0 @@
-<%
-site_name = 'Freifunk Hamburg Nordwest'
-site_code = 'ffhh-nowe'
-
-prefix4 = '10.112.192.0/19'
-prefix6 = '2a03:2267:3::/64'
-
-next_node_ipv4 = '10.112.192.1'
-next_node_ipv6 = '2a03:2267:3::1'
-
-mtu = 1312
-
-gateways = {
- "gateway01" => {
- "key" => "aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b",
- "remotes" => [ '"gw01-new.hamburg.freifunk.net" port 10007' ]
- },
- "gateway02" => {
- "key" => "462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0",
- "remotes" => [ '"gw02-new.hamburg.freifunk.net" port 10007' ]
- },
- "gateway03" => {
- "key" => "e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546",
- "remotes" => [ '"gw03-new.hamburg.freifunk.net" port 10007' ]
- },
- "gateway04" => {
- "key" => "a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669",
- "remotes" => [ '"gw04-new.hamburg.freifunk.net" port 10008' ]
- },
- "gateway05" => {
- "key" => "291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f",
- "remotes" => [ '"gw05-new.hamburg.freifunk.net" port 10008' ]
- },
- "gateway06" => {
- "key" => "8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43",
- "remotes" => [ '"gw06-new.hamburg.freifunk.net" port 10008' ]
- },
-}
--%>
diff --git a/config/ffhh-ost.erb b/config/ffhh-ost.erb
deleted file mode 100644
index 8539b32..0000000
--- a/config/ffhh-ost.erb
+++ /dev/null
@@ -1,39 +0,0 @@
-<%
-site_name = 'Freifunk Hamburg Ost'
-site_code = 'ffhh-ost'
-
-prefix4 = '10.112.224.0/19'
-prefix6 = '2a03:2267:4::/64'
-
-next_node_ipv4 = '10.112.224.1'
-next_node_ipv6 = '2a03:2267:4::1'
-
-mtu = 1312
-
-gateways = {
- "gateway01" => {
- "key" => "aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b",
- "remotes" => [ '"gw01-new.hamburg.freifunk.net" port 10009' ]
- },
- "gateway02" => {
- "key" => "462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0",
- "remotes" => [ '"gw02-new.hamburg.freifunk.net" port 10009' ]
- },
- "gateway03" => {
- "key" => "e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546",
- "remotes" => [ '"gw03-new.hamburg.freifunk.net" port 10009' ]
- },
- "gateway04" => {
- "key" => "a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669",
- "remotes" => [ '"gw04-new.hamburg.freifunk.net" port 10010' ]
- },
- "gateway05" => {
- "key" => "291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f",
- "remotes" => [ '"gw05-new.hamburg.freifunk.net" port 10010' ]
- },
- "gateway06" => {
- "key" => "8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43",
- "remotes" => [ '"gw06-new.hamburg.freifunk.net" port 10010' ]
- },
-}
--%>
diff --git a/config/ffhh-sued.erb b/config/ffhh-sued.erb
deleted file mode 100644
index 2f76b16..0000000
--- a/config/ffhh-sued.erb
+++ /dev/null
@@ -1,39 +0,0 @@
-<%
-site_name = 'Freifunk Hamburg Sued'
-site_code = 'ffhh-sued'
-
-prefix4 = '10.112.64.0/19'
-prefix6 = '2a03:2267:1::/64'
-
-next_node_ipv4 = '10.112.64.1'
-next_node_ipv6 = '2a03:2267:1::1'
-
-mtu = 1312
-
-gateways = {
- "gateway01" => {
- "key" => "aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b",
- "remotes" => [ '"gw01-new.hamburg.freifunk.net" port 10003' ]
- },
- "gateway02" => {
- "key" => "462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0",
- "remotes" => [ '"gw02-new.hamburg.freifunk.net" port 10003' ]
- },
- "gateway03" => {
- "key" => "e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546",
- "remotes" => [ '"gw03-new.hamburg.freifunk.net" port 10003' ]
- },
- "gateway04" => {
- "key" => "fca88dd58316f4ab50d2a697123dddf4d0ba3aad52ddeb0ba7835cdbbeb60dbf",
- "remotes" => [ '"gw04-new.hamburg.freifunk.net" port 10004' ]
- },
- "gateway05" => {
- "key" => "84986658775167dff6918dc8e0529c4a4524cb1782849a80933ddb6d8c6bd3f5",
- "remotes" => [ '"gw05-new.hamburg.freifunk.net" port 10004' ]
- },
- "gateway06" => {
- "key" => "fb608aa75180ba88b4a3399a6498e68796d200afc1bfd275a0dcb903a31f39b6",
- "remotes" => [ '"gw06-new.hamburg.freifunk.net" port 10004' ]
- },
-}
--%>
diff --git a/config/ffhh-west.erb b/config/ffhh-west.erb
deleted file mode 100644
index aaf5399..0000000
--- a/config/ffhh-west.erb
+++ /dev/null
@@ -1,39 +0,0 @@
-<%
-site_name = 'Freifunk Hamburg West'
-site_code = 'ffhh-west'
-
-prefix4 = '10.112.96.0/19'
-prefix6 = '2a03:2267:2::/64'
-
-next_node_ipv4 = '10.112.96.1'
-next_node_ipv6 = '2a03:2267:2::1'
-
-mtu = 1312
-
-gateways = {
- "gateway01" => {
- "key" => "aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b",
- "remotes" => [ '"gw01-new.hamburg.freifunk.net" port 10005' ]
- },
- "gateway02" => {
- "key" => "462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0",
- "remotes" => [ '"gw02-new.hamburg.freifunk.net" port 10005' ]
- },
- "gateway03" => {
- "key" => "e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546",
- "remotes" => [ '"gw03-new.hamburg.freifunk.net" port 10005' ]
- },
- "gateway04" => {
- "key" => "a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669",
- "remotes" => [ '"gw04-new.hamburg.freifunk.net" port 10006' ]
- },
- "gateway05" => {
- "key" => "291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f",
- "remotes" => [ '"gw05-new.hamburg.freifunk.net" port 10006' ]
- },
- "gateway06" => {
- "key" => "8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43",
- "remotes" => [ '"gw06-new.hamburg.freifunk.net" port 10006' ]
- },
-}
--%>
diff --git a/domains/ffhh_nowe.conf b/domains/ffhh_nowe.conf
new file mode 100644
index 0000000..90aed0c
--- /dev/null
+++ b/domains/ffhh_nowe.conf
@@ -0,0 +1,72 @@
+{
+ domain_names = {
+ ffhh_nowe = "Hamburg Nordwest",
+ },
+ domain_seed = '666668682D6E6F776548616D6275726748616D6275726748616D627572674861',
+
+ prefix4 = '10.112.192.0/19',
+ prefix6 = '2a03:2267:3::/64',
+
+ next_node = {
+ ip4 = '10.112.192.1',
+ ip6 = '2a03:2267:3::1',
+ mac = '16:41:95:40:f7:dc',
+ },
+
+ wifi24 = {
+ ap = {
+ ssid = "hamburg.freifunk.net",
+ },
+ mesh = {
+ id = '6668682D6E6F7765',
+ },
+ },
+
+ wifi5 = {
+ ap = {
+ ssid = "hamburg.freifunk.net",
+ },
+ mesh = {
+ id = '6668682D6E6F7765',
+ },
+ },
+
+ mesh = {
+ vxlan = false,
+ },
+
+ mesh_vpn = {
+ fastd = {
+ groups = {
+ backbone = {
+ peers = {
+ gateway01 = {
+ remotes = { '"gw01-new.hamburg.freifunk.net" port 10007' },
+ key = 'aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b',
+ },
+ gateway02 = {
+ remotes = { '"gw02-new.hamburg.freifunk.net" port 10007' },
+ key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0',
+ },
+ gateway03 = {
+ remotes = { '"gw03-new.hamburg.freifunk.net" port 10007' },
+ key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546',
+ },
+ gateway04 = {
+ remotes = { '"gw04-new.hamburg.freifunk.net" port 10008' },
+ key = 'a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669',
+ },
+ gateway05 = {
+ remotes = { '"gw05-new.hamburg.freifunk.net" port 10008' },
+ key = '291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f',
+ },
+ gateway06 = {
+ remotes = { '"gw06-new.hamburg.freifunk.net" port 10008' },
+ key = '8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43',
+ },
+ },
+ },
+ },
+ },
+ },
+}
diff --git a/domains/ffhh_ost.conf b/domains/ffhh_ost.conf
new file mode 100644
index 0000000..7c2b948
--- /dev/null
+++ b/domains/ffhh_ost.conf
@@ -0,0 +1,72 @@
+{
+ domain_names = {
+ ffhh_ost = "Hamburg Ost",
+ },
+ domain_seed = '666668682D6F737448616D6275726748616D6275726748616D6275726748616D',
+
+ prefix4 = '10.112.224.0/19',
+ prefix6 = '2a03:2267:4::/64',
+
+ next_node = {
+ ip4 = '10.112.224.1',
+ ip6 = '2a03:2267:4::1',
+ mac = '16:41:95:40:f7:dc',
+ },
+
+ wifi24 = {
+ ap = {
+ ssid = "hamburg.freifunk.net",
+ },
+ mesh = {
+ id = '666668682D6F7374',
+ },
+ },
+
+ wifi5 = {
+ ap = {
+ ssid = "hamburg.freifunk.net",
+ },
+ mesh = {
+ id = '666668682D6F7374',
+ },
+ },
+
+ mesh = {
+ vxlan = false,
+ },
+
+ mesh_vpn = {
+ fastd = {
+ groups = {
+ backbone = {
+ peers = {
+ gateway01 = {
+ remotes = { '"gw01-new.hamburg.freifunk.net" port 10009' },
+ key = 'aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b',
+ },
+ gateway02 = {
+ remotes = { '"gw02-new.hamburg.freifunk.net" port 10009' },
+ key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0',
+ },
+ gateway03 = {
+ remotes = { '"gw03-new.hamburg.freifunk.net" port 10009' },
+ key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546',
+ },
+ gateway04 = {
+ remotes = { '"gw04-new.hamburg.freifunk.net" port 10010' },
+ key = 'a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669',
+ },
+ gateway05 = {
+ remotes = { '"gw05-new.hamburg.freifunk.net" port 10010' },
+ key = '291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f',
+ },
+ gateway06 = {
+ key = '8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43',
+ remotes = { '"gw06-new.hamburg.freifunk.net" port 10010' },
+ },
+ },
+ },
+ },
+ },
+ },
+}
diff --git a/domains/ffhh_sued.conf b/domains/ffhh_sued.conf
new file mode 100644
index 0000000..42da4ca
--- /dev/null
+++ b/domains/ffhh_sued.conf
@@ -0,0 +1,72 @@
+{
+ domain_names = {
+ ffhh_sued = "Hamburg Süd",
+ },
+ domain_seed = '666668682D7375656448616D6275726748616D6275726748616D627572674861',
+
+ prefix4 = '10.112.64.0/19',
+ prefix6 = '2a03:2267:1::/64',
+
+ next_node = {
+ ip4 = '10.112.64.1',
+ ip6 = '2a03:2267:1::1',
+ mac = '16:41:95:40:f7:dc',
+ },
+
+ wifi24 = {
+ ap = {
+ ssid = "hamburg.freifunk.net",
+ },
+ mesh = {
+ id = '6668682D73756564',
+ },
+ },
+
+ wifi5 = {
+ ap = {
+ ssid = "hamburg.freifunk.net",
+ },
+ mesh = {
+ id = '6668682D73756564',
+ },
+ },
+
+ mesh = {
+ vxlan = false,
+ },
+
+ mesh_vpn = {
+ fastd = {
+ groups = {
+ backbone = {
+ peers = {
+ gateway01 = {
+ remotes = { '"gw01-new.hamburg.freifunk.net" port 10003' },
+ key = 'aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b',
+ },
+ gateway02 = {
+ key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0',
+ remotes = { '"gw02-new.hamburg.freifunk.net" port 10003' },
+ },
+ gateway03 = {
+ remotes = { '"gw03-new.hamburg.freifunk.net" port 10003' },
+ key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546',
+ },
+ gateway04 = {
+ remotes = { '"gw04-new.hamburg.freifunk.net" port 10004' },
+ key = 'a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669',
+ },
+ gateway05 = {
+ remotes = { '"gw05-new.hamburg.freifunk.net" port 10004' },
+ key = '291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f',
+ },
+ gateway06 = {
+ remotes = { '"gw06-new.hamburg.freifunk.net" port 10004' },
+ key = '8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43',
+ },
+ },
+ },
+ },
+ },
+ },
+}
diff --git a/domains/ffhh_west.conf b/domains/ffhh_west.conf
new file mode 100644
index 0000000..80c0c15
--- /dev/null
+++ b/domains/ffhh_west.conf
@@ -0,0 +1,72 @@
+{
+ domain_names = {
+ ffhh_west = "Hamburg West",
+ },
+ domain_seed = '666668682D7765737448616D6275726748616D6275726748616D627572674861',
+
+ prefix4 = '10.112.96.0/19',
+ prefix6 = '2a03:2267:2::/64',
+
+ next_node = {
+ ip4 = '10.112.96.1',
+ ip6 = '2a03:2267:2::1',
+ mac = '16:41:95:40:f7:dc',
+ },
+
+ wifi24 = {
+ ap = {
+ ssid = "hamburg.freifunk.net",
+ },
+ mesh = {
+ id = '6668682D77657374',
+ },
+ },
+
+ wifi5 = {
+ ap = {
+ ssid = "hamburg.freifunk.net",
+ },
+ mesh = {
+ id = '6668682D77657374',
+ },
+ },
+
+ mesh = {
+ vxlan = false,
+ },
+
+ mesh_vpn = {
+ fastd = {
+ groups = {
+ backbone = {
+ peers = {
+ gateway01 = {
+ remotes = { '"gw01-new.hamburg.freifunk.net" port 10005' },
+ key = 'aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b',
+ },
+ gateway02 = {
+ key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0',
+ remotes = { '"gw02-new.hamburg.freifunk.net" port 10005' },
+ },
+ gateway03 = {
+ remotes = { '"gw03-new.hamburg.freifunk.net" port 10005' },
+ key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546',
+ },
+ gateway04 = {
+ remotes = { '"gw04-new.hamburg.freifunk.net" port 10006' },
+ key = 'a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669',
+ },
+ gateway05 = {
+ remotes = { '"gw05-new.hamburg.freifunk.net" port 10006' },
+ key = '291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f',
+ },
+ gateway06 = {
+ remotes = { '"gw06-new.hamburg.freifunk.net" port 10006' },
+ key = '8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43',
+ },
+ },
+ },
+ },
+ },
+ },
+}
diff --git a/template/modules.erb b/modules
similarity index 100%
rename from template/modules.erb
rename to modules
diff --git a/site.conf b/site.conf
new file mode 100644
index 0000000..6de2bb8
--- /dev/null
+++ b/site.conf
@@ -0,0 +1,105 @@
+{
+ hostname_prefix = 'GibMirEinenNamen',
+ config_mode = {
+ hostname = {
+ optional = false,
+ prefill = false,
+ },
+ },
+
+ site_name = 'Freifunk Hamburg',
+ site_code = 'ffhh',
+ default_domain = 'ffhh_nowe',
+
+ opkg = {
+ lede = 'http://lede.opkg.services.ffhh/snapshots/packages/%A',
+ extra = {
+ modules = 'http://updates.hamburg.freifunk.net/all/stable/archive/modules/gluon-%GR/%S',
+ },
+ },
+
+ timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
+ ntp_servers = {'1.ntp.services.ffhh','2.ntp.services.ffhh','3.ntp.services.ffhh'},
+ regdom = 'DE',
+
+ wifi24 = {
+ channel = 1,
+
+ supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+ basic_rate = {6000, 9000, 18000, 36000, 54000},
+
+ mesh = {
+ mcast_rate = 12000,
+ },
+ },
+
+ wifi5 = {
+ channel = 44,
+ mesh = {
+ mcast_rate = 12000,
+ },
+ },
+
+ mesh_vpn = {
+ enabled = true,
+ mtu = 1312,
+ fastd = {
+ configurable = true,
+ methods = {'salsa2012+umac'},
+ groups = {
+ backbone = {
+ limit = 1,
+ },
+ },
+ },
+ bandwidth_limit = {
+ enabled = false,
+ ingress = 8096,
+ egress = 1024,
+ },
+ },
+
+ autoupdater = {
+ branch = 'stable',
+ branches = {
+ stable = {
+ name = 'stable',
+ mirrors = {'http://1.updates.services.ffhh/all/stable/sysupgrade','http://2.updates.services.ffhh/all/stable/sysupgrade'},
+ good_signatures = 2,
+ pubkeys = {
+ 'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo
+ '3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre
+ '1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot
+ 'bd5a70d4c3df30eaa860d615c0e0526b0dda5bc60c09c20972bce4ffa7512659', -- bjoern
+ 'd9992853c0fe1a2e983cc222b6bd26e70d4fb2a53862ac099144e9e8142238d0', -- daniel
+ '961495a04512e5ba1843fd3c216d8af6ef2fdb19f93055142803e2da26d670b9', -- alexander
+ 'ed6278f168f0382adf4f058cb9c31d8f1145abb968a8626045de7d6d87a0be40', -- olli
+ },
+ },
+ beta = {
+ name = 'beta',
+ mirrors = {'http://1.updates.services.ffhh/all/beta/sysupgrade','http://2.updates.services.ffhh/all/beta/sysupgrade'},
+ good_signatures = 2,
+ pubkeys = {
+ 'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo
+ '3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre
+ '1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot
+ 'bd5a70d4c3df30eaa860d615c0e0526b0dda5bc60c09c20972bce4ffa7512659', -- bjoern
+ 'd9992853c0fe1a2e983cc222b6bd26e70d4fb2a53862ac099144e9e8142238d0', -- daniel
+ '961495a04512e5ba1843fd3c216d8af6ef2fdb19f93055142803e2da26d670b9', -- alexander
+ 'ed6278f168f0382adf4f058cb9c31d8f1145abb968a8626045de7d6d87a0be40', -- olli
+ },
+ },
+ experimental = {
+ name = 'experimental',
+ mirrors = {'http://1.updates.services.ffhh/all/experimental/sysupgrade','http://2.updates.services.ffhh/all/experimental/sysupgrade'},
+ good_signatures = 1,
+ pubkeys = {
+ '1a0112fe489860068480c611c5dc56196c2f1a645db651ea2ed19ae0f0e8e1d1', -- builder1/2
+ },
+ },
+ },
+ },
+
+ poe_passthrough = false,
+}
diff --git a/template/site.mk.erb b/site.mk
similarity index 83%
rename from template/site.mk.erb
rename to site.mk
index 2b4b7de..3c5fb5d 100644
--- a/template/site.mk.erb
+++ b/site.mk
@@ -1,3 +1,5 @@
+GLUON_MULTIDOMAIN := 1
+
GLUON_SITE_PACKAGES := -gluon-config-mode-geo-location \
-gluon-config-mode-contact-info \
gluon-ebtables-source-filter \
@@ -8,6 +10,7 @@ GLUON_SITE_PACKAGES := -gluon-config-mode-geo-location \
GLUON_FEATURES := \
autoupdater \
+ config-mode-domain-select \
ebtables-filter-multicast \
ebtables-filter-ra-dhcp \
ebtables-limit-arp \
@@ -37,14 +40,7 @@ GLUON_SITE_PACKAGES += \
$(EXTRA_SOFTWARE_TOOLS_01)
endif
-
-
-DEFAULT_GLUON_RELEASE := <%= gluon_release %>
-
-# Allow overriding the release number from the command line
-GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
-
-GLUON_PRIORITY ?= 0
+GLUON_PRIORITY ?= 7
# Region code required for some images; supported values: us eu
GLUON_REGION ?= eu
diff --git a/template/info.erb b/template/info.erb
deleted file mode 100644
index 685d4a9..0000000
--- a/template/info.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-GLUON_RELEASE="<%= gluon_release %>"
-GLUON_BRANCH="<%= gluon_branch %>"
-targets="<%= gluon_targets.join(" ") %>"
diff --git a/template/site.conf.erb b/template/site.conf.erb
deleted file mode 100644
index cb8c9c0..0000000
--- a/template/site.conf.erb
+++ /dev/null
@@ -1,128 +0,0 @@
-{
- hostname_prefix = 'GibMirEinenNamen',
- config_mode = {
- hostname = {
- optional = false,
- prefill = false,
- },
- },
- site_name = '<%= site_name %>',
- site_code = '<%= site_code %>',
- domain_seed = '<%= (site_code + ("Hamburg" * 7))[0..31].each_byte.map { |b| b.to_s(16) }.join.upcase %>',
-
- opkg = {
- lede = 'http://lede.opkg.services.ffhh/snapshots/packages/%A',
- extra = {
- modules = 'http://updates.hamburg.freifunk.net/%GS/stable/archive/modules/gluon-%GS-%GR/%S',
- },
- },
-
- prefix4 = '<%= prefix4 %>',
- prefix6 = '<%= prefix6 %>',
-
- timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
- ntp_servers = {'1.ntp.services.ffhh','2.ntp.services.ffhh','3.ntp.services.ffhh'},
- regdom = 'DE',
-
- mesh = {
- vxlan = false,
- },
-
- wifi24 = {
- channel = 1,
-
- supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
- basic_rate = {6000, 9000, 18000, 36000, 54000},
-
- ap = {
- ssid = 'hamburg.freifunk.net',
- },
- mesh = {
- id = '<%= ("00000000" + site_code)[-8..-1].each_byte.map { |b| b.to_s(16) }.join.upcase %>',
- mcast_rate = 12000,
- },
- },
-
- wifi5 = {
- channel = 44,
- ap = {
- ssid = 'hamburg.freifunk.net',
- },
- mesh = {
- id = '<%= ("00000000" + site_code)[-8..-1].each_byte.map { |b| b.to_s(16) }.join.upcase %>',
- mcast_rate = 12000,
- },
- },
-
- next_node = {
- ip4 = '<%= next_node_ipv4 %>',
- ip6 = '<%= next_node_ipv6 %>',
-
- mac = '16:41:95:40:f7:dc',
- },
-
- mesh_vpn = {
- enabled = true,
- mtu = <%= mtu %>,
- fastd = {
- configurable = true,
- methods = {'salsa2012+umac'},
- groups = {
- backbone = {
- limit = 1,
- peers = {
-<% gateways.each_pair do | name, gw_data | -%>
- <%= name %> = {
- key = '<%= gw_data['key'] %>',
- remotes = { '<%= gw_data['remotes'].join("', '") %>' },
- },
-<% end -%>
- },
- },
- },
- },
- bandwidth_limit = {
- enabled = false,
- ingress = 8096,
- egress = 1024,
- },
- },
-
- autoupdater = {
- branch = '<%= gluon_branch %>',
- branches = {
- stable = {
- name = 'stable',
- mirrors = {'http://1.updates.services.ffhh/<%= site_code %>/stable/sysupgrade','http://2.updates.services.ffhh/<%= site_code %>/stable/sysupgrade'},
- good_signatures = 2,
- pubkeys = {
-<% signing_keys.each do | key | -%>
- '<%= key %>',
-<% end -%>
- },
- },
- beta = {
- name = 'beta',
- mirrors = {'http://1.updates.services.ffhh/<%= site_code %>/beta/sysupgrade','http://2.updates.services.ffhh/<%= site_code %>/beta/sysupgrade'},
- good_signatures = 2,
- pubkeys = {
-<% signing_keys.each do | key | -%>
- '<%= key %>',
-<% end -%>
- },
- },
- experimental = {
- name = 'experimental',
- mirrors = {'http://1.updates.services.ffhh/<%= site_code %>/experimental/sysupgrade','http://2.updates.services.ffhh/<%= site_code %>/experimental/sysupgrade'},
- good_signatures = 1,
- pubkeys = {
-<% signing_keys_experimental.each do | key | -%>
- '<%= key %>',
-<% end -%>
- },
- },
- },
- },
-
- poe_passthrough = false,
-}
From 791e08de22e9c79b38dee971a563be1b5aa21908 Mon Sep 17 00:00:00 2001
From: Matthias Wientapper <m.wientapper@gmx.de>
Date: Tue, 9 Oct 2018 23:15:30 +0200
Subject: [PATCH 12/75] =?UTF-8?q?Text=20f=C3=BCr=20Multi-Domain=20Konfigur?=
=?UTF-8?q?ationsseite?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
i18n/de.po | 8 ++++++++
i18n/en.po | 9 +++++++++
2 files changed, 17 insertions(+)
diff --git a/i18n/de.po b/i18n/de.po
index 9119cd8..58dfb28 100644
--- a/i18n/de.po
+++ b/i18n/de.po
@@ -16,6 +16,14 @@ msgstr ""
"Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen "
"entsprechend aus und sende es ab. "
"Den unten anzugebenden Knotennamen kannst du beliebig wählen. Denke Dir also etwas schönes aus. Er ist der Name des Knotens im Netzwerk und hat nichts mit dem ausgestrahlten Netzwerknamen (SSID) zu tun. Letzterer ist immer hamburg.freifunk.net."
+
+msgid "gluon-config-mode:domain"
+msgstr "Domäne"
+
+msgid "gluon-config-mode:domain-select"
+msgstr ""
+"Hier kannst du Domäne auswählen, in dem sich dein Knoten befindet. "
+"Bitte bedenke, dass sich dein Knoten nur mit Routern in der gleichen Domäne verbinden kann."
msgid "gluon-config-mode:pubkey"
msgstr ""
diff --git a/i18n/en.po b/i18n/en.po
index 124cfba..f64501f 100644
--- a/i18n/en.po
+++ b/i18n/en.po
@@ -19,6 +19,15 @@ msgstr ""
"the network and has nothing to do with the broadcast network name (SSID). "
"The latter is always hamburg.freifunk.net."
+msgid "gluon-config-mode:domain"
+msgstr "Domain"
+
+msgid "gluon-config-mode:domain-select"
+msgstr ""
+"Here you have the possibility of selecting the mesh domain in which your node "
+"is placed. Please keep in mind that your router only connects with the nodes "
+"of the selected domain"
+
msgid "gluon-config-mode:pubkey"
msgstr ""
"<p>This is the public key for your Freifunk node. You can only "
From d1ff8a93eab322a57c4e5d5f3c2d30a70a8b867e Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Sun, 4 Nov 2018 21:59:52 +0100
Subject: [PATCH 13/75] Variable was renamed to GLUON_WLAN_MESH and 11s is the
default, so just remove the variable
---
site.mk | 2 --
1 file changed, 2 deletions(-)
diff --git a/site.mk b/site.mk
index 3c5fb5d..76cc687 100644
--- a/site.mk
+++ b/site.mk
@@ -45,6 +45,4 @@ GLUON_PRIORITY ?= 7
# Region code required for some images; supported values: us eu
GLUON_REGION ?= eu
-GLUON_ATH10K_MESH ?= 11s
-
GLUON_LANGS ?= en de
From b8cdd470595d37405925b967859b6eac22c1f438 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 30 Nov 2018 21:49:29 +0100
Subject: [PATCH 14/75] Update README.md for v2018.1.3.0
(cherry picked from commit eb41a5a3cd774be058351d33b76cf87470c77b8f)
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index be0254a..45a61af 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
#### Gluon versions used for specific Hamburg Freifunk Firmware builds
+- v2018.1.3.0: site-ffhh: v2018.1.3.0, gluon: v2018.1.3
- v2018.1.1.0: site-ffhh: v2018.1.1.0, gluon: v2018.1.1
- v2018.1.0.0: site-ffhh: v2018.1.0.0, gluon: v2018.1 (never rolled out due to issues with the auto updater in gluon)
- 0.9.2: site-ffhh: v0.9.2, gluon: v2017.1.8
From f86bb6ca0c068eb915a4cb456e6725dd756057ab Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 21 Dec 2018 20:26:32 +0100
Subject: [PATCH 15/75] bump version numbers to gluon v2018.1.4
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index 45a61af..94d5584 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
#### Gluon versions used for specific Hamburg Freifunk Firmware builds
+- v2018.1.4.0: site-ffhh: v2018.1.4.0, gluon: v2018.1.4
- v2018.1.3.0: site-ffhh: v2018.1.3.0, gluon: v2018.1.3
- v2018.1.1.0: site-ffhh: v2018.1.1.0, gluon: v2018.1.1
- v2018.1.0.0: site-ffhh: v2018.1.0.0, gluon: v2018.1 (never rolled out due to issues with the auto updater in gluon)
From 680e7a2501fd9fb538e8d4dbc39b64ab52a6acf5 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 1 Feb 2019 21:17:33 +0100
Subject: [PATCH 16/75] Fix Version and update URL for autoupdate
---
build.conf | 2 +-
site.conf | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/build.conf b/build.conf
index 84afa92..f3b8466 100644
--- a/build.conf
+++ b/build.conf
@@ -1,3 +1,3 @@
-GLUON_RELEASE="master~201810011"
+GLUON_RELEASE="v2018.1.4.x-multi"
GLUON_BRANCH="experimental"
targets="ar71xx-generic ar71xx-nand ar71xx-tiny brcm2708-bcm2708 brcm2708-bcm2709 ipq40xx ipq806x mpc85xx-generic ramips-mt7620 ramips-mt7621 ramips-mt76x8 ramips-rt305x sunxi-cortexa7 x86-64 x86-generic x86-geode"
diff --git a/site.conf b/site.conf
index 6de2bb8..f598cdd 100644
--- a/site.conf
+++ b/site.conf
@@ -14,7 +14,7 @@
opkg = {
lede = 'http://lede.opkg.services.ffhh/snapshots/packages/%A',
extra = {
- modules = 'http://updates.hamburg.freifunk.net/all/stable/archive/modules/gluon-%GR/%S',
+ modules = 'http://updates.hamburg.freifunk.net/multi/stable/archive/modules/gluon-%GR/%S',
},
},
@@ -64,7 +64,7 @@
branches = {
stable = {
name = 'stable',
- mirrors = {'http://1.updates.services.ffhh/all/stable/sysupgrade','http://2.updates.services.ffhh/all/stable/sysupgrade'},
+ mirrors = {'http://1.updates.services.ffhh/multi/stable/sysupgrade','http://2.updates.services.ffhh/multi/stable/sysupgrade'},
good_signatures = 2,
pubkeys = {
'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo
@@ -78,7 +78,7 @@
},
beta = {
name = 'beta',
- mirrors = {'http://1.updates.services.ffhh/all/beta/sysupgrade','http://2.updates.services.ffhh/all/beta/sysupgrade'},
+ mirrors = {'http://1.updates.services.ffhh/multi/beta/sysupgrade','http://2.updates.services.ffhh/multi/beta/sysupgrade'},
good_signatures = 2,
pubkeys = {
'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo
@@ -92,7 +92,7 @@
},
experimental = {
name = 'experimental',
- mirrors = {'http://1.updates.services.ffhh/all/experimental/sysupgrade','http://2.updates.services.ffhh/all/experimental/sysupgrade'},
+ mirrors = {'http://1.updates.services.ffhh/multi/experimental/sysupgrade','http://2.updates.services.ffhh/multi/experimental/sysupgrade'},
good_signatures = 1,
pubkeys = {
'1a0112fe489860068480c611c5dc56196c2f1a645db651ea2ed19ae0f0e8e1d1', -- builder1/2
From 35d976d1363fb2f9035d0b0cb7b0f4fd809b74b0 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 4 Feb 2019 22:28:09 +0100
Subject: [PATCH 17/75] =?UTF-8?q?build.sh=20bugfix=20f=C3=BCr=20experiment?=
=?UTF-8?q?al?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
build.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/build.sh b/build.sh
index 5a4bbe6..5ac1e42 100755
--- a/build.sh
+++ b/build.sh
@@ -69,6 +69,7 @@ announce FFHH SITE PATH: $site_path >&2
pushd $site_path
. ./build.conf
+[ "${GLUON_BRANCH}" = "experimental" ] && GLUON_RELEASE="${GLUON_RELEASE}~exp$(date +%Y%m%d)"
export GLUON_RELEASE
export GLUON_BRANCH
# if a list of build targets has been supplied, only build those
From 40b96f1213c36bd7234e69715317757bde963c8a Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 8 Feb 2019 15:34:43 +0100
Subject: [PATCH 18/75] Version bump v2018.1.4.2
---
build.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.conf b/build.conf
index f3b8466..3af16cb 100644
--- a/build.conf
+++ b/build.conf
@@ -1,3 +1,3 @@
-GLUON_RELEASE="v2018.1.4.x-multi"
-GLUON_BRANCH="experimental"
+GLUON_RELEASE="v2018.1.4.2"
+GLUON_BRANCH="stable"
targets="ar71xx-generic ar71xx-nand ar71xx-tiny brcm2708-bcm2708 brcm2708-bcm2709 ipq40xx ipq806x mpc85xx-generic ramips-mt7620 ramips-mt7621 ramips-mt76x8 ramips-rt305x sunxi-cortexa7 x86-64 x86-generic x86-geode"
From bc84c03fc4d92bc10fb3ab5e454cb4d6519964eb Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 8 Feb 2019 20:56:16 +0100
Subject: [PATCH 19/75] Update readme for single domain firmware
---
README.md | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index 94d5584..6eb52b5 100644
--- a/README.md
+++ b/README.md
@@ -5,12 +5,8 @@
$ git clone -b SITE_VERSION https://github.com/freifunkhamburg/site-ffhh.git
$ cd site-ffhh
- To build all domains into the subdirectory firmware:
+ To build the firmware into the subdirectory firmware:
$ ./build.sh -g ../gluon -o firmware
- To build a specific domain (for example ffhh-nowe) into the subdirectory firmware:
- $ ./build.sh -g ../gluon -l ffhh-nowe -o firmware
- To build two specific domains (for example ffhh-nowe and ffhh-sued) into the subdirectory firmware:
- $ ./build.sh -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.
@@ -19,6 +15,8 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
#### Gluon versions used for specific Hamburg Freifunk Firmware builds
+- v2018.1.4.2: site-ffhh: v2018.1.4.2, gluon: v2018.1.4
+- v2018.1.4.1: site-ffhh: v2018.1.4.1, gluon: v2018.1.4
- v2018.1.4.0: site-ffhh: v2018.1.4.0, gluon: v2018.1.4
- v2018.1.3.0: site-ffhh: v2018.1.3.0, gluon: v2018.1.3
- v2018.1.1.0: site-ffhh: v2018.1.1.0, gluon: v2018.1.1
From 6201fe4f0622c97d3ac13a98856334821942ce77 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 8 Feb 2019 20:27:13 +0100
Subject: [PATCH 20/75] Fix package directory and path for the autoupdater
---
site.conf | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/site.conf b/site.conf
index f598cdd..da5ffc1 100644
--- a/site.conf
+++ b/site.conf
@@ -14,7 +14,7 @@
opkg = {
lede = 'http://lede.opkg.services.ffhh/snapshots/packages/%A',
extra = {
- modules = 'http://updates.hamburg.freifunk.net/multi/stable/archive/modules/gluon-%GR/%S',
+ modules = 'http://updates.hamburg.freifunk.net/multi/archive/%GR/packages/gluon-%GS-%GR/%S',
},
},
@@ -64,7 +64,7 @@
branches = {
stable = {
name = 'stable',
- mirrors = {'http://1.updates.services.ffhh/multi/stable/sysupgrade','http://2.updates.services.ffhh/multi/stable/sysupgrade'},
+ mirrors = {'http://1.updates.services.ffhh/multi/stable/images/sysupgrade','http://2.updates.services.ffhh/multi/stable/images/sysupgrade'},
good_signatures = 2,
pubkeys = {
'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo
@@ -78,7 +78,7 @@
},
beta = {
name = 'beta',
- mirrors = {'http://1.updates.services.ffhh/multi/beta/sysupgrade','http://2.updates.services.ffhh/multi/beta/sysupgrade'},
+ mirrors = {'http://1.updates.services.ffhh/multi/stable/images/sysupgrade','http://2.updates.services.ffhh/multi/stable/images/sysupgrade'},
good_signatures = 2,
pubkeys = {
'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo
@@ -92,7 +92,7 @@
},
experimental = {
name = 'experimental',
- mirrors = {'http://1.updates.services.ffhh/multi/experimental/sysupgrade','http://2.updates.services.ffhh/multi/experimental/sysupgrade'},
+ mirrors = {'http://1.updates.services.ffhh/multi/experimental/images/sysupgrade','http://2.updates.services.ffhh/multi/experimental/images/sysupgrade'},
good_signatures = 1,
pubkeys = {
'1a0112fe489860068480c611c5dc56196c2f1a645db651ea2ed19ae0f0e8e1d1', -- builder1/2
From 4914976cda08a8355409564fac1ed29fb1891b0a Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 8 Feb 2019 21:48:18 +0100
Subject: [PATCH 21/75] Update targets
---
build.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.conf b/build.conf
index 3af16cb..84056db 100644
--- a/build.conf
+++ b/build.conf
@@ -1,3 +1,3 @@
GLUON_RELEASE="v2018.1.4.2"
GLUON_BRANCH="stable"
-targets="ar71xx-generic ar71xx-nand ar71xx-tiny brcm2708-bcm2708 brcm2708-bcm2709 ipq40xx ipq806x mpc85xx-generic ramips-mt7620 ramips-mt7621 ramips-mt76x8 ramips-rt305x sunxi-cortexa7 x86-64 x86-generic x86-geode"
+targets="ar71xx-generic ar71xx-mikrotik ar71xx-nand ar71xx-tiny brcm2708-bcm2708 brcm2708-bcm2709 brcm2708-bcm2710 ipq806x mpc85xx-generic mvebu ramips-mt7620 ramips-mt7621 ramips-mt7628 ramips-rt305x sunxi x86-64 x86-generic x86-geode"
From feb4f63df7ecb3ee45e2ecc430187b6234a02fd8 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Sun, 10 Feb 2019 17:23:58 +0100
Subject: [PATCH 22/75] Move update servers away from .ffhh domain
---
site.conf | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/site.conf b/site.conf
index da5ffc1..c8c0822 100644
--- a/site.conf
+++ b/site.conf
@@ -64,7 +64,7 @@
branches = {
stable = {
name = 'stable',
- mirrors = {'http://1.updates.services.ffhh/multi/stable/images/sysupgrade','http://2.updates.services.ffhh/multi/stable/images/sysupgrade'},
+ mirrors = {'http://updates-a.hamburg.freifunk.net/multi/stable/images/sysupgrade','http://updates-b.hamburg.freifunk.net/multi/stable/images/sysupgrade'},
good_signatures = 2,
pubkeys = {
'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo
@@ -78,7 +78,7 @@
},
beta = {
name = 'beta',
- mirrors = {'http://1.updates.services.ffhh/multi/stable/images/sysupgrade','http://2.updates.services.ffhh/multi/stable/images/sysupgrade'},
+ mirrors = {'http://updates-a.hamburg.freifunk.net/multi/stable/images/sysupgrade','http://updates-b.hamburg.freifunk.net/multi/stable/images/sysupgrade'},
good_signatures = 2,
pubkeys = {
'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo
@@ -92,7 +92,7 @@
},
experimental = {
name = 'experimental',
- mirrors = {'http://1.updates.services.ffhh/multi/experimental/images/sysupgrade','http://2.updates.services.ffhh/multi/experimental/images/sysupgrade'},
+ mirrors = {'http://updates-a.hamburg.freifunk.net/multi/experimental/images/sysupgrade','http://updates-b.hamburg.freifunk.net/multi/experimental/images/sysupgrade'},
good_signatures = 1,
pubkeys = {
'1a0112fe489860068480c611c5dc56196c2f1a645db651ea2ed19ae0f0e8e1d1', -- builder1/2
From 7bbd9ad6218da8a221a8284534dafc1e44908f97 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 18 Feb 2019 20:45:31 +0100
Subject: [PATCH 23/75] Fix stable target build list
---
build.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.conf b/build.conf
index 84056db..d03c1a4 100644
--- a/build.conf
+++ b/build.conf
@@ -1,3 +1,3 @@
GLUON_RELEASE="v2018.1.4.2"
GLUON_BRANCH="stable"
-targets="ar71xx-generic ar71xx-mikrotik ar71xx-nand ar71xx-tiny brcm2708-bcm2708 brcm2708-bcm2709 brcm2708-bcm2710 ipq806x mpc85xx-generic mvebu ramips-mt7620 ramips-mt7621 ramips-mt7628 ramips-rt305x sunxi x86-64 x86-generic x86-geode"
+targets="ar71xx-generic ar71xx-nand ar71xx-tiny brcm2708-bcm2708 brcm2708-bcm2709 mpc85xx-generic ramips-mt7620 ramips-mt7621 ramips-mt7628 ramips-rt305x sunxi x86-64 x86-generic x86-geode"
From 001a6b6a6b996e72e4e86678e17876d96149c32f Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 22 Mar 2019 20:56:30 +0100
Subject: [PATCH 24/75] generate images.list after building the firmware
---
build.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/build.sh b/build.sh
index 5ac1e42..d9360f1 100755
--- a/build.sh
+++ b/build.sh
@@ -96,6 +96,8 @@ for t in $targets; do
announce Starting build for $t... >&2
make -j$(nproc) GLUON_TARGET=$t $verbose
done
+# Generate the images.list
+( cd "${GLUON_OUTPUTDIR}/images" && find -type f ! -iname '*.manifest' ! -iname images.list | sed -e 's!^\./\(.*\)$!\1!' -e 's!/! !g' | sort > images.list )
announce Building manifest...
make manifest
if [ -n "${signature}" ]; then
From 4fb0b6769a1ea386ccdb1a8415f3535c7d9858e4 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 12 Apr 2019 19:59:34 +0200
Subject: [PATCH 25/75] fix the list of the firmware files in images.list to
include symlinks
---
build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.sh b/build.sh
index d9360f1..5008580 100755
--- a/build.sh
+++ b/build.sh
@@ -97,7 +97,7 @@ for t in $targets; do
make -j$(nproc) GLUON_TARGET=$t $verbose
done
# Generate the images.list
-( cd "${GLUON_OUTPUTDIR}/images" && find -type f ! -iname '*.manifest' ! -iname images.list | sed -e 's!^\./\(.*\)$!\1!' -e 's!/! !g' | sort > images.list )
+( cd "${GLUON_OUTPUTDIR}/images" && ( find -type f ! -iname '*.manifest' ! -iname images.list; find -type l ! -iname '*.manifest' ) | sed -e 's!^\./\(.*\)$!\1!' -e 's!/! !g' | sort > images.list )
announce Building manifest...
make manifest
if [ -n "${signature}" ]; then
From 67ee1300b838f6e4ebc35bc93b6cc318bf9754af Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 26 Apr 2019 19:47:12 +0200
Subject: [PATCH 26/75] Bump version numbers for v2018.2.1.0
---
README.md | 1 +
build.conf | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 6eb52b5..1f20ab2 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
#### Gluon versions used for specific Hamburg Freifunk Firmware builds
+- v2018.2.1.0: site-ffhh: v2018.2.1.0, gluon: v2018.2.1
- v2018.1.4.2: site-ffhh: v2018.1.4.2, gluon: v2018.1.4
- v2018.1.4.1: site-ffhh: v2018.1.4.1, gluon: v2018.1.4
- v2018.1.4.0: site-ffhh: v2018.1.4.0, gluon: v2018.1.4
diff --git a/build.conf b/build.conf
index d03c1a4..79f9521 100644
--- a/build.conf
+++ b/build.conf
@@ -1,3 +1,3 @@
-GLUON_RELEASE="v2018.1.4.2"
+GLUON_RELEASE="v2018.2.1.0"
GLUON_BRANCH="stable"
targets="ar71xx-generic ar71xx-nand ar71xx-tiny brcm2708-bcm2708 brcm2708-bcm2709 mpc85xx-generic ramips-mt7620 ramips-mt7621 ramips-mt7628 ramips-rt305x sunxi x86-64 x86-generic x86-geode"
From 7c9f32db1ebefca9cd05ebd208e64e2f7eab3d53 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 26 Apr 2019 22:20:13 +0200
Subject: [PATCH 27/75] rename target ramips-mt7628 to ramips-mt76x8
---
build.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.conf b/build.conf
index 79f9521..050ec2f 100644
--- a/build.conf
+++ b/build.conf
@@ -1,3 +1,3 @@
GLUON_RELEASE="v2018.2.1.0"
GLUON_BRANCH="stable"
-targets="ar71xx-generic ar71xx-nand ar71xx-tiny brcm2708-bcm2708 brcm2708-bcm2709 mpc85xx-generic ramips-mt7620 ramips-mt7621 ramips-mt7628 ramips-rt305x sunxi x86-64 x86-generic x86-geode"
+targets="ar71xx-generic ar71xx-nand ar71xx-tiny brcm2708-bcm2708 brcm2708-bcm2709 mpc85xx-generic ramips-mt7620 ramips-mt7621 ramips-mt76x8 ramips-rt305x sunxi x86-64 x86-generic x86-geode"
From 1dc6507e8cc3fe29b35c85c1fa7dbd24615b96d0 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Sat, 27 Apr 2019 22:58:53 +0200
Subject: [PATCH 28/75] rename target sunxi to sunxi-cortexa7
---
build.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.conf b/build.conf
index 050ec2f..5b9c9c4 100644
--- a/build.conf
+++ b/build.conf
@@ -1,3 +1,3 @@
GLUON_RELEASE="v2018.2.1.0"
GLUON_BRANCH="stable"
-targets="ar71xx-generic ar71xx-nand ar71xx-tiny brcm2708-bcm2708 brcm2708-bcm2709 mpc85xx-generic ramips-mt7620 ramips-mt7621 ramips-mt76x8 ramips-rt305x sunxi x86-64 x86-generic x86-geode"
+targets="ar71xx-generic ar71xx-nand ar71xx-tiny brcm2708-bcm2708 brcm2708-bcm2709 mpc85xx-generic ramips-mt7620 ramips-mt7621 ramips-mt76x8 ramips-rt305x sunxi-cortexa7 x86-64 x86-generic x86-geode"
From 12e8b053f5d7e1a133d892bb8d2ffb1e18423d5c Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Sun, 26 May 2019 22:14:30 +0200
Subject: [PATCH 29/75] fix some (not all) warnings that shellcheck displays
---
build.sh | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/build.sh b/build.sh
index 5008580..90d36d1 100755
--- a/build.sh
+++ b/build.sh
@@ -2,7 +2,7 @@
set -e
function announce () {
- echo '############################' $* >&2
+ echo '############################' "$@" >&2
}
function usage () {
echo "Usage: $0 -g GLUON_PATH" >&2
@@ -60,21 +60,21 @@ if [ -z "$gluon_path" ]; then
exit 1
fi
-gluon_path=$(realpath $gluon_path)
-gluon_out=$(realpath $gluon_out)
-site_path=$(realpath $(dirname $BASH_SOURCE))
+gluon_path=$(realpath "$gluon_path")
+gluon_out=$(realpath "$gluon_out")
+site_path=$(realpath "$(dirname "$BASH_SOURCE")")
-announce GLUON: $gluon_path >&2
-announce FFHH SITE PATH: $site_path >&2
+announce GLUON: "$gluon_path" >&2
+announce FFHH SITE PATH: "$site_path" >&2
-pushd $site_path
+pushd "$site_path"
. ./build.conf
[ "${GLUON_BRANCH}" = "experimental" ] && GLUON_RELEASE="${GLUON_RELEASE}~exp$(date +%Y%m%d)"
export GLUON_RELEASE
export GLUON_BRANCH
# if a list of build targets has been supplied, only build those
targets="$(echo "${build_targets:-$targets}" | sed -e 's_,_ _g')"
-announce The following targets will be generated: $targets >&2
+announce "The following targets will be generated: $targets" >&2
popd
pushd "${gluon_path}"
@@ -85,16 +85,16 @@ rm -rf "${GLUON_OUTPUTDIR}"
mkdir -p "${GLUON_OUTPUTDIR}"
make update
# Try to install patches. I wasn't able to figure out how patches in gluon/site/patches work.
-for p in ${site_path}/patches/*.patch; do
- if [ -e "$p" -a ! -f "${gluon_path}/${p##*/}" ]; then
- announce Installing patch $p
- patch -p1 < $p
+for p in "${site_path}"/patches/*.patch; do
+ if [ -e "$p" ] && [ ! -f "${gluon_path}/${p##*/}" ]; then
+ announce "Installing patch $p"
+ patch -p1 < "$p"
touch "${gluon_path}/${p##*/}"
fi
done
for t in $targets; do
- announce Starting build for $t... >&2
- make -j$(nproc) GLUON_TARGET=$t $verbose
+ announce "Starting build for $t..." >&2
+ make "-j$(nproc)" "GLUON_TARGET=$t" "$verbose"
done
# Generate the images.list
( cd "${GLUON_OUTPUTDIR}/images" && ( find -type f ! -iname '*.manifest' ! -iname images.list; find -type l ! -iname '*.manifest' ) | sed -e 's!^\./\(.*\)$!\1!' -e 's!/! !g' | sort > images.list )
From 256e9dfe98acfe801800b10d98e01b10d5e58bea Mon Sep 17 00:00:00 2001
From: bobcanthelpyou <bob@canthelpyou.com>
Date: Tue, 18 Jun 2019 22:42:27 +0200
Subject: [PATCH 30/75] Remove lede opkg mirror
---
site.conf | 1 -
1 file changed, 1 deletion(-)
diff --git a/site.conf b/site.conf
index c8c0822..4f76331 100644
--- a/site.conf
+++ b/site.conf
@@ -12,7 +12,6 @@
default_domain = 'ffhh_nowe',
opkg = {
- lede = 'http://lede.opkg.services.ffhh/snapshots/packages/%A',
extra = {
modules = 'http://updates.hamburg.freifunk.net/multi/archive/%GR/packages/gluon-%GS-%GR/%S',
},
From 23952fdaf5b10d53c881b09b12c430459cbfc75e Mon Sep 17 00:00:00 2001
From: bobcanthelpyou <bob@canthelpyou.com>
Date: Sun, 16 Jun 2019 23:38:13 +0200
Subject: [PATCH 31/75] remove obsolete wifi24 rates settings
---
site.conf | 3 ---
1 file changed, 3 deletions(-)
diff --git a/site.conf b/site.conf
index 4f76331..c8ea474 100644
--- a/site.conf
+++ b/site.conf
@@ -24,9 +24,6 @@
wifi24 = {
channel = 1,
- supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
- basic_rate = {6000, 9000, 18000, 36000, 54000},
-
mesh = {
mcast_rate = 12000,
},
From bc82d9d6b75c992ae08a0683e4dd776d9f68dc8b Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 5 Jul 2019 21:15:35 +0200
Subject: [PATCH 32/75] Add GLUON_DEPRECATED variable
---
site.mk | 1 +
1 file changed, 1 insertion(+)
diff --git a/site.mk b/site.mk
index 76cc687..efd1464 100644
--- a/site.mk
+++ b/site.mk
@@ -1,4 +1,5 @@
GLUON_MULTIDOMAIN := 1
+GLUON_DEPRECATED := upgrade
GLUON_SITE_PACKAGES := -gluon-config-mode-geo-location \
-gluon-config-mode-contact-info \
From 9eadb86c82474ab9aa3d1278cc25daf7863a3667 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 16 Aug 2019 22:44:43 +0200
Subject: [PATCH 33/75] build.sh: automatically detect available targets and
build them all
---
build.sh | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/build.sh b/build.sh
index 90d36d1..768a212 100755
--- a/build.sh
+++ b/build.sh
@@ -8,6 +8,7 @@ function usage () {
echo "Usage: $0 -g GLUON_PATH" >&2
echo " -g GLUON_PATH Path to a checkout of the gluon repository." >&2
echo " -t TARGETS Comma separated list of gluon targets to build" >&2
+ echo " -a Automatically detect and build all targets." >&2
echo " -o OUT_PATH Path to the firmware output directory. Default: ${gluon_out}" >&2
echo " -s SIGNATURE Sign firmware with signature" >&2
echo " -b BROKEN=1" >&2
@@ -20,6 +21,9 @@ gluon_out="${HOME}/firmware"
while [ $# -gt 0 ]; do
case "$1" in
+ -a)
+ auto_targets=1
+ ;;
-g)
gluon_path="$2"
shift
@@ -72,15 +76,20 @@ pushd "$site_path"
[ "${GLUON_BRANCH}" = "experimental" ] && GLUON_RELEASE="${GLUON_RELEASE}~exp$(date +%Y%m%d)"
export GLUON_RELEASE
export GLUON_BRANCH
-# if a list of build targets has been supplied, only build those
-targets="$(echo "${build_targets:-$targets}" | sed -e 's_,_ _g')"
+export GLUON_SITEDIR="${site_path}"
+export GLUON_OUTPUTDIR="${gluon_out}/${GLUON_RELEASE}/${GLUON_BRANCH}"
+pushd "${gluon_path}"
+if [ "$auto_targets" = "1" ]; then
+ # detect available targets
+ targets="$(make | awk '$1 == "*" {print $2}' | sort | xargs)"
+else
+ # if a list of build targets has been supplied, only build those
+ targets="$(echo "${build_targets:-$targets}" | sed -e 's_,_ _g')"
+fi
announce "The following targets will be generated: $targets" >&2
popd
-pushd "${gluon_path}"
announce Starting make update...
-export GLUON_SITEDIR="${site_path}"
-export GLUON_OUTPUTDIR="${gluon_out}/${GLUON_RELEASE}/${GLUON_BRANCH}"
rm -rf "${GLUON_OUTPUTDIR}"
mkdir -p "${GLUON_OUTPUTDIR}"
make update
From e763875644aabae083fa704d841b36b6e451791c Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 16 Aug 2019 22:53:20 +0200
Subject: [PATCH 34/75] build.sh: fix the ordering of the steps
---
build.sh | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/build.sh b/build.sh
index 768a212..b724efc 100755
--- a/build.sh
+++ b/build.sh
@@ -78,17 +78,9 @@ export GLUON_RELEASE
export GLUON_BRANCH
export GLUON_SITEDIR="${site_path}"
export GLUON_OUTPUTDIR="${gluon_out}/${GLUON_RELEASE}/${GLUON_BRANCH}"
-pushd "${gluon_path}"
-if [ "$auto_targets" = "1" ]; then
- # detect available targets
- targets="$(make | awk '$1 == "*" {print $2}' | sort | xargs)"
-else
- # if a list of build targets has been supplied, only build those
- targets="$(echo "${build_targets:-$targets}" | sed -e 's_,_ _g')"
-fi
-announce "The following targets will be generated: $targets" >&2
popd
+pushd "${gluon_path}"
announce Starting make update...
rm -rf "${GLUON_OUTPUTDIR}"
mkdir -p "${GLUON_OUTPUTDIR}"
@@ -101,6 +93,16 @@ for p in "${site_path}"/patches/*.patch; do
touch "${gluon_path}/${p##*/}"
fi
done
+
+if [ "$auto_targets" = "1" ]; then
+ # detect available targets
+ targets="$(make | awk '$1 == "*" {print $2}' | sort | xargs)"
+else
+ # if a list of build targets has been supplied, only build those
+ targets="$(echo "${build_targets:-$targets}" | sed -e 's_,_ _g')"
+fi
+announce "The following targets will be generated: $targets" >&2
+
for t in $targets; do
announce "Starting build for $t..." >&2
make "-j$(nproc)" "GLUON_TARGET=$t" "$verbose"
From f4b45ff5f7789afc631b73fb9ba7e6cf61a8f61e Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 16 Aug 2019 22:58:56 +0200
Subject: [PATCH 35/75] build.sh: the make that lists the targets can run a
long time, copy the output to /dev/stderr
---
build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.sh b/build.sh
index b724efc..820790a 100755
--- a/build.sh
+++ b/build.sh
@@ -96,7 +96,7 @@ done
if [ "$auto_targets" = "1" ]; then
# detect available targets
- targets="$(make | awk '$1 == "*" {print $2}' | sort | xargs)"
+ targets="$(make | tee /dev/stderr | awk '$1 == "*" {print $2}' | sort | xargs)"
else
# if a list of build targets has been supplied, only build those
targets="$(echo "${build_targets:-$targets}" | sed -e 's_,_ _g')"
From 44e04d3d9c7f7a435e7740aad3c0d023a54c2079 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 16 Aug 2019 23:01:45 +0200
Subject: [PATCH 36/75] build.sh: dont build everything while detecting the
targets...
---
build.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/build.sh b/build.sh
index 820790a..8ea0fc2 100755
--- a/build.sh
+++ b/build.sh
@@ -96,7 +96,8 @@ done
if [ "$auto_targets" = "1" ]; then
# detect available targets
- targets="$(make | tee /dev/stderr | awk '$1 == "*" {print $2}' | sort | xargs)"
+ make
+ targets="$(make | awk '$1 == "*" {print $2}' | sort | xargs)"
else
# if a list of build targets has been supplied, only build those
targets="$(echo "${build_targets:-$targets}" | sed -e 's_,_ _g')"
From fbb4b5dc780c33a28891af5f07993513807b09c2 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 16 Aug 2019 23:23:55 +0200
Subject: [PATCH 37/75] build.sh: use list-targets make target
---
build.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/build.sh b/build.sh
index 8ea0fc2..13e874b 100755
--- a/build.sh
+++ b/build.sh
@@ -96,8 +96,7 @@ done
if [ "$auto_targets" = "1" ]; then
# detect available targets
- make
- targets="$(make | awk '$1 == "*" {print $2}' | sort | xargs)"
+ targets="$(make list-targets | sort | xargs)"
else
# if a list of build targets has been supplied, only build those
targets="$(echo "${build_targets:-$targets}" | sed -e 's_,_ _g')"
From cfebeb94b5b044dc1ae38529482cb0833a2e6838 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Sun, 18 Aug 2019 13:15:52 +0200
Subject: [PATCH 38/75] build.sh: some cleanup with shellcheck
---
build.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/build.sh b/build.sh
index 13e874b..ac89af9 100755
--- a/build.sh
+++ b/build.sh
@@ -72,6 +72,7 @@ announce GLUON: "$gluon_path" >&2
announce FFHH SITE PATH: "$site_path" >&2
pushd "$site_path"
+# shellcheck source=/dev/null
. ./build.conf
[ "${GLUON_BRANCH}" = "experimental" ] && GLUON_RELEASE="${GLUON_RELEASE}~exp$(date +%Y%m%d)"
export GLUON_RELEASE
@@ -108,7 +109,8 @@ for t in $targets; do
make "-j$(nproc)" "GLUON_TARGET=$t" "$verbose"
done
# Generate the images.list
-( cd "${GLUON_OUTPUTDIR}/images" && ( find -type f ! -iname '*.manifest' ! -iname images.list; find -type l ! -iname '*.manifest' ) | sed -e 's!^\./\(.*\)$!\1!' -e 's!/! !g' | sort > images.list )
+# shellcheck disable=SC2094
+( cd "${GLUON_OUTPUTDIR}/images" && ( find . -type f ! -iname '*.manifest' ! -iname images.list; find . -type l ! -iname '*.manifest' ) | sed -e 's!^\./\(.*\)$!\1!' -e 's!/! !g' | sort > images.list )
announce Building manifest...
make manifest
if [ -n "${signature}" ]; then
From 50b79c0dc415725195930f8fccf04c971e22e23c Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Sun, 18 Aug 2019 13:16:31 +0200
Subject: [PATCH 39/75] build.sh: remove known-broken images after the build
---
build.conf | 3 +++
build.sh | 6 ++++++
2 files changed, 9 insertions(+)
diff --git a/build.conf b/build.conf
index 5b9c9c4..6cb03ae 100644
--- a/build.conf
+++ b/build.conf
@@ -1,3 +1,6 @@
GLUON_RELEASE="v2018.2.1.0"
GLUON_BRANCH="stable"
targets="ar71xx-generic ar71xx-nand ar71xx-tiny brcm2708-bcm2708 brcm2708-bcm2709 mpc85xx-generic ramips-mt7620 ramips-mt7621 ramips-mt76x8 ramips-rt305x sunxi-cortexa7 x86-64 x86-generic x86-geode"
+broken_images=(
+ '*dir*615*d*'
+)
diff --git a/build.sh b/build.sh
index ac89af9..bd80e84 100755
--- a/build.sh
+++ b/build.sh
@@ -108,6 +108,12 @@ for t in $targets; do
announce "Starting build for $t..." >&2
make "-j$(nproc)" "GLUON_TARGET=$t" "$verbose"
done
+# Remove known-broken images
+# shellcheck disable=SC2154
+for broken_image in "${broken_images[@]}"; do
+ announce "Removing broken image ${broken_image}..."
+ find "${GLUON_OUTPUTDIR}/${GLUON_BRANCH}/images" -iname "${broken_image}" \( -type f -o -type l \) -ls -exec rm -f {} \;
+done
# Generate the images.list
# shellcheck disable=SC2094
( cd "${GLUON_OUTPUTDIR}/images" && ( find . -type f ! -iname '*.manifest' ! -iname images.list; find . -type l ! -iname '*.manifest' ) | sed -e 's!^\./\(.*\)$!\1!' -e 's!/! !g' | sort > images.list )
From 74088a18a9c2cc648bcd341d7768e8f6bc4c7d71 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Sun, 18 Aug 2019 23:55:55 +0200
Subject: [PATCH 40/75] build.sh: fix remove known-broken images after the
build
---
build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.sh b/build.sh
index bd80e84..ce00e05 100755
--- a/build.sh
+++ b/build.sh
@@ -112,7 +112,7 @@ done
# shellcheck disable=SC2154
for broken_image in "${broken_images[@]}"; do
announce "Removing broken image ${broken_image}..."
- find "${GLUON_OUTPUTDIR}/${GLUON_BRANCH}/images" -iname "${broken_image}" \( -type f -o -type l \) -ls -exec rm -f {} \;
+ find "${GLUON_OUTPUTDIR}/images" -iname "${broken_image}" \( -type f -o -type l \) -ls -exec rm -f {} \;
done
# Generate the images.list
# shellcheck disable=SC2094
From 91adc7864649673c8de58eb21d7d4c2079289b34 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 6 Sep 2019 20:48:30 +0200
Subject: [PATCH 41/75] Cleanup some wrong indentation
---
domains/ffhh_nowe.conf | 12 ++++++------
domains/ffhh_ost.conf | 12 ++++++------
domains/ffhh_sued.conf | 12 ++++++------
domains/ffhh_west.conf | 12 ++++++------
4 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/domains/ffhh_nowe.conf b/domains/ffhh_nowe.conf
index 90aed0c..cefc8ee 100644
--- a/domains/ffhh_nowe.conf
+++ b/domains/ffhh_nowe.conf
@@ -42,27 +42,27 @@
peers = {
gateway01 = {
remotes = { '"gw01-new.hamburg.freifunk.net" port 10007' },
- key = 'aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b',
+ key = 'aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b',
},
gateway02 = {
remotes = { '"gw02-new.hamburg.freifunk.net" port 10007' },
- key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0',
+ key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0',
},
gateway03 = {
remotes = { '"gw03-new.hamburg.freifunk.net" port 10007' },
- key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546',
+ key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546',
},
gateway04 = {
remotes = { '"gw04-new.hamburg.freifunk.net" port 10008' },
- key = 'a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669',
+ key = 'a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669',
},
gateway05 = {
remotes = { '"gw05-new.hamburg.freifunk.net" port 10008' },
- key = '291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f',
+ key = '291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f',
},
gateway06 = {
remotes = { '"gw06-new.hamburg.freifunk.net" port 10008' },
- key = '8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43',
+ key = '8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43',
},
},
},
diff --git a/domains/ffhh_ost.conf b/domains/ffhh_ost.conf
index 7c2b948..be7bf30 100644
--- a/domains/ffhh_ost.conf
+++ b/domains/ffhh_ost.conf
@@ -42,26 +42,26 @@
peers = {
gateway01 = {
remotes = { '"gw01-new.hamburg.freifunk.net" port 10009' },
- key = 'aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b',
+ key = 'aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b',
},
gateway02 = {
remotes = { '"gw02-new.hamburg.freifunk.net" port 10009' },
- key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0',
+ key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0',
},
gateway03 = {
remotes = { '"gw03-new.hamburg.freifunk.net" port 10009' },
- key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546',
+ key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546',
},
gateway04 = {
remotes = { '"gw04-new.hamburg.freifunk.net" port 10010' },
- key = 'a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669',
+ key = 'a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669',
},
gateway05 = {
remotes = { '"gw05-new.hamburg.freifunk.net" port 10010' },
- key = '291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f',
+ key = '291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f',
},
gateway06 = {
- key = '8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43',
+ key = '8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43',
remotes = { '"gw06-new.hamburg.freifunk.net" port 10010' },
},
},
diff --git a/domains/ffhh_sued.conf b/domains/ffhh_sued.conf
index 42da4ca..722aa25 100644
--- a/domains/ffhh_sued.conf
+++ b/domains/ffhh_sued.conf
@@ -42,27 +42,27 @@
peers = {
gateway01 = {
remotes = { '"gw01-new.hamburg.freifunk.net" port 10003' },
- key = 'aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b',
+ key = 'aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b',
},
gateway02 = {
- key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0',
+ key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0',
remotes = { '"gw02-new.hamburg.freifunk.net" port 10003' },
},
gateway03 = {
remotes = { '"gw03-new.hamburg.freifunk.net" port 10003' },
- key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546',
+ key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546',
},
gateway04 = {
remotes = { '"gw04-new.hamburg.freifunk.net" port 10004' },
- key = 'a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669',
+ key = 'a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669',
},
gateway05 = {
remotes = { '"gw05-new.hamburg.freifunk.net" port 10004' },
- key = '291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f',
+ key = '291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f',
},
gateway06 = {
remotes = { '"gw06-new.hamburg.freifunk.net" port 10004' },
- key = '8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43',
+ key = '8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43',
},
},
},
diff --git a/domains/ffhh_west.conf b/domains/ffhh_west.conf
index 80c0c15..361446c 100644
--- a/domains/ffhh_west.conf
+++ b/domains/ffhh_west.conf
@@ -42,27 +42,27 @@
peers = {
gateway01 = {
remotes = { '"gw01-new.hamburg.freifunk.net" port 10005' },
- key = 'aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b',
+ key = 'aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b',
},
gateway02 = {
- key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0',
+ key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0',
remotes = { '"gw02-new.hamburg.freifunk.net" port 10005' },
},
gateway03 = {
remotes = { '"gw03-new.hamburg.freifunk.net" port 10005' },
- key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546',
+ key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546',
},
gateway04 = {
remotes = { '"gw04-new.hamburg.freifunk.net" port 10006' },
- key = 'a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669',
+ key = 'a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669',
},
gateway05 = {
remotes = { '"gw05-new.hamburg.freifunk.net" port 10006' },
- key = '291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f',
+ key = '291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f',
},
gateway06 = {
remotes = { '"gw06-new.hamburg.freifunk.net" port 10006' },
- key = '8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43',
+ key = '8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43',
},
},
},
From 9ec6df8a052a5d502ebea7ff6b5ea73f24b3e5f5 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 6 Sep 2019 21:26:31 +0200
Subject: [PATCH 42/75] set mesh.batman_adv.routing_algo to BATMAN_IV as it is
now mandatory
---
domains/ffhh_nowe.conf | 3 +++
domains/ffhh_ost.conf | 3 +++
domains/ffhh_sued.conf | 3 +++
domains/ffhh_west.conf | 3 +++
4 files changed, 12 insertions(+)
diff --git a/domains/ffhh_nowe.conf b/domains/ffhh_nowe.conf
index cefc8ee..4ecba48 100644
--- a/domains/ffhh_nowe.conf
+++ b/domains/ffhh_nowe.conf
@@ -33,6 +33,9 @@
mesh = {
vxlan = false,
+ batman_adv = {
+ routing_algo = "BATMAN_IV",
+ },
},
mesh_vpn = {
diff --git a/domains/ffhh_ost.conf b/domains/ffhh_ost.conf
index be7bf30..941b75d 100644
--- a/domains/ffhh_ost.conf
+++ b/domains/ffhh_ost.conf
@@ -33,6 +33,9 @@
mesh = {
vxlan = false,
+ batman_adv = {
+ routing_algo = "BATMAN_IV",
+ },
},
mesh_vpn = {
diff --git a/domains/ffhh_sued.conf b/domains/ffhh_sued.conf
index 722aa25..1a6f31f 100644
--- a/domains/ffhh_sued.conf
+++ b/domains/ffhh_sued.conf
@@ -33,6 +33,9 @@
mesh = {
vxlan = false,
+ batman_adv = {
+ routing_algo = "BATMAN_IV",
+ },
},
mesh_vpn = {
diff --git a/domains/ffhh_west.conf b/domains/ffhh_west.conf
index 361446c..ca3c22a 100644
--- a/domains/ffhh_west.conf
+++ b/domains/ffhh_west.conf
@@ -33,6 +33,9 @@
mesh = {
vxlan = false,
+ batman_adv = {
+ routing_algo = "BATMAN_IV",
+ },
},
mesh_vpn = {
From 2affcbeb3e9dbd1c4fea0ffa989b464c35232438 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Sun, 25 Aug 2019 11:12:56 +0200
Subject: [PATCH 43/75] build.sh: create images.list with first line indication
the release version
---
build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.sh b/build.sh
index ce00e05..72fe790 100755
--- a/build.sh
+++ b/build.sh
@@ -116,7 +116,7 @@ for broken_image in "${broken_images[@]}"; do
done
# Generate the images.list
# shellcheck disable=SC2094
-( cd "${GLUON_OUTPUTDIR}/images" && ( find . -type f ! -iname '*.manifest' ! -iname images.list; find . -type l ! -iname '*.manifest' ) | sed -e 's!^\./\(.*\)$!\1!' -e 's!/! !g' | sort > images.list )
+( cd "${GLUON_OUTPUTDIR}/images" && ( echo "RELEASE=${GLUON_RELEASE}"; find . -type f ! -iname '*.manifest' ! -iname images.list; find . -type l ! -iname '*.manifest' ) | sed -e 's!^\./\(.*\)$!\1!' -e 's!/! !g' | sort > images.list )
announce Building manifest...
make manifest
if [ -n "${signature}" ]; then
From 678c61ae10df15dbad77229c91998fa462edd6bb Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 13 Sep 2019 20:26:13 +0200
Subject: [PATCH 44/75] Update README.md for v2018.2.3.0
(cherry picked from commit 4608dcd94ae8b9a383fe250502b0f86055afbc6e)
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index 1f20ab2..ef1a9a2 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
#### Gluon versions used for specific Hamburg Freifunk Firmware builds
+- v2018.2.3.0: site-ffhh: v2018.2.3.0, gluon: v2018.2.3
- v2018.2.1.0: site-ffhh: v2018.2.1.0, gluon: v2018.2.1
- v2018.1.4.2: site-ffhh: v2018.1.4.2, gluon: v2018.1.4
- v2018.1.4.1: site-ffhh: v2018.1.4.1, gluon: v2018.1.4
From a60bb91b77d4f8a238d4a88d0c3f1e8b4663e491 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Sat, 21 Sep 2019 16:38:11 +0200
Subject: [PATCH 45/75] build.sh: Fix a stupid error that prevents building
without -v
Signed-off-by: Daniel Frank <git@danielfrank.net>
---
build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.sh b/build.sh
index 72fe790..88611d9 100755
--- a/build.sh
+++ b/build.sh
@@ -106,7 +106,7 @@ announce "The following targets will be generated: $targets" >&2
for t in $targets; do
announce "Starting build for $t..." >&2
- make "-j$(nproc)" "GLUON_TARGET=$t" "$verbose"
+ make "-j$(nproc)" "GLUON_TARGET=$t" $verbose
done
# Remove known-broken images
# shellcheck disable=SC2154
From 88a1d79c852edbc99cbf04317c79328904dd7a4e Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Sat, 21 Sep 2019 16:41:58 +0200
Subject: [PATCH 46/75] build.sh: get rid of some shellcheck warnings
---
build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.sh b/build.sh
index 88611d9..4bf0eed 100755
--- a/build.sh
+++ b/build.sh
@@ -66,7 +66,7 @@ fi
gluon_path=$(realpath "$gluon_path")
gluon_out=$(realpath "$gluon_out")
-site_path=$(realpath "$(dirname "$BASH_SOURCE")")
+site_path=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
announce GLUON: "$gluon_path" >&2
announce FFHH SITE PATH: "$site_path" >&2
From e5934ce04fc1d3b0aec60a59f6cfb686294afe4f Mon Sep 17 00:00:00 2001
From: Ruben Barkow <github@r.z11.de>
Date: Sun, 1 Dec 2019 19:37:15 +0100
Subject: [PATCH 47/75] fix indentions
---
site.mk | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/site.mk b/site.mk
index efd1464..4d57d91 100644
--- a/site.mk
+++ b/site.mk
@@ -1,7 +1,8 @@
GLUON_MULTIDOMAIN := 1
GLUON_DEPRECATED := upgrade
-GLUON_SITE_PACKAGES := -gluon-config-mode-geo-location \
+GLUON_SITE_PACKAGES := \
+ -gluon-config-mode-geo-location \
-gluon-config-mode-contact-info \
gluon-ebtables-source-filter \
gluon-web-mesh-vpn-fastd \
@@ -25,20 +26,20 @@ GLUON_FEATURES := \
# EXTRA_SOFTWARE_TOOLS_01
EXTRA_SOFTWARE_TOOLS_01 := \
- nano \
- htop \
- ethtool
+ nano \
+ htop \
+ ethtool
# x86
ifeq ($(GLUON_TARGET),x86-generic)
GLUON_SITE_PACKAGES += \
- $(EXTRA_SOFTWARE_TOOLS_01)
+ $(EXTRA_SOFTWARE_TOOLS_01)
endif
# x86-64
ifeq ($(GLUON_TARGET),x86-64)
GLUON_SITE_PACKAGES += \
- $(EXTRA_SOFTWARE_TOOLS_01)
+ $(EXTRA_SOFTWARE_TOOLS_01)
endif
GLUON_PRIORITY ?= 7
From cd90115c7461ec01ce9226689545658a7aba7e4b Mon Sep 17 00:00:00 2001
From: Ruben Barkow <github@r.z11.de>
Date: Sun, 1 Dec 2019 19:40:00 +0100
Subject: [PATCH 48/75] gluon-radvd and gluon-ebtables-limit-arp are already in
batman feature
---
site.mk | 2 --
1 file changed, 2 deletions(-)
diff --git a/site.mk b/site.mk
index 4d57d91..7c9fbe0 100644
--- a/site.mk
+++ b/site.mk
@@ -15,10 +15,8 @@ GLUON_FEATURES := \
config-mode-domain-select \
ebtables-filter-multicast \
ebtables-filter-ra-dhcp \
- ebtables-limit-arp \
mesh-batman-adv-15 \
mesh-vpn-fastd \
- radvd \
respondd \
status-page \
web-advanced \
From 553ba5c01e1498f58e0e61c14c79f2f7901b6732 Mon Sep 17 00:00:00 2001
From: Ruben Barkow <github@r.z11.de>
Date: Sun, 1 Dec 2019 19:50:36 +0100
Subject: [PATCH 49/75] unify setting of extra software on x86-generic and
x86-64
---
site.mk | 22 ++++++----------------
1 file changed, 6 insertions(+), 16 deletions(-)
diff --git a/site.mk b/site.mk
index 7c9fbe0..aea0325 100644
--- a/site.mk
+++ b/site.mk
@@ -22,22 +22,12 @@ GLUON_FEATURES := \
web-advanced \
web-wizard
-# EXTRA_SOFTWARE_TOOLS_01
-EXTRA_SOFTWARE_TOOLS_01 := \
- nano \
- htop \
- ethtool
-
-# x86
-ifeq ($(GLUON_TARGET),x86-generic)
-GLUON_SITE_PACKAGES += \
- $(EXTRA_SOFTWARE_TOOLS_01)
-endif
-
-# x86-64
-ifeq ($(GLUON_TARGET),x86-64)
-GLUON_SITE_PACKAGES += \
- $(EXTRA_SOFTWARE_TOOLS_01)
+# x86 and x86-64 add extra software
+ifeq ($(GLUON_TARGET),$(filter $(GLUON_TARGET),x86-generic x86-64))
+ GLUON_SITE_PACKAGES += \
+ nano \
+ htop \
+ ethtool
endif
GLUON_PRIORITY ?= 7
From dcc3abbea9cb6bc4639be9b1bde74fd3737a718b Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 13 Dec 2019 22:11:59 +0100
Subject: [PATCH 50/75] Prepare migration to gluon v2019.1
---
README.md | 1 +
build.conf | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index ef1a9a2..43739ca 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
#### Gluon versions used for specific Hamburg Freifunk Firmware builds
+- v2019.1.0.0: site-ffhh: v2019.1.0.0, gluon: v2019.1
- v2018.2.3.0: site-ffhh: v2018.2.3.0, gluon: v2018.2.3
- v2018.2.1.0: site-ffhh: v2018.2.1.0, gluon: v2018.2.1
- v2018.1.4.2: site-ffhh: v2018.1.4.2, gluon: v2018.1.4
diff --git a/build.conf b/build.conf
index 6cb03ae..deac187 100644
--- a/build.conf
+++ b/build.conf
@@ -1,4 +1,4 @@
-GLUON_RELEASE="v2018.2.1.0"
+GLUON_RELEASE="v2019.1.0.0"
GLUON_BRANCH="stable"
targets="ar71xx-generic ar71xx-nand ar71xx-tiny brcm2708-bcm2708 brcm2708-bcm2709 mpc85xx-generic ramips-mt7620 ramips-mt7621 ramips-mt76x8 ramips-rt305x sunxi-cortexa7 x86-64 x86-generic x86-geode"
broken_images=(
From 049172bb0341154d4bdba6a516978161a3c3a397 Mon Sep 17 00:00:00 2001
From: Ruben Barkow-Kuder <rubo77@users.noreply.github.com>
Date: Sun, 1 Dec 2019 13:03:55 +0100
Subject: [PATCH 51/75] add web-private-wifi
---
site.mk | 1 +
1 file changed, 1 insertion(+)
diff --git a/site.mk b/site.mk
index efd1464..c2a3ba0 100644
--- a/site.mk
+++ b/site.mk
@@ -17,6 +17,7 @@ GLUON_FEATURES := \
ebtables-limit-arp \
mesh-batman-adv-15 \
mesh-vpn-fastd \
+ web-private-wifi \
radvd \
respondd \
status-page \
From c23854de97487b2edfd57f93431a259973f09284 Mon Sep 17 00:00:00 2001
From: Ruben Barkow <github@r.z11.de>
Date: Sun, 1 Dec 2019 19:35:15 +0100
Subject: [PATCH 52/75] add gluon-radv-filterd
---
site.mk | 1 +
1 file changed, 1 insertion(+)
diff --git a/site.mk b/site.mk
index c2a3ba0..d214e8c 100644
--- a/site.mk
+++ b/site.mk
@@ -19,6 +19,7 @@ GLUON_FEATURES := \
mesh-vpn-fastd \
web-private-wifi \
radvd \
+ radv-filterd \
respondd \
status-page \
web-advanced \
From 48083c51def4783a317dfb7225a3e669a7fce205 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 8 Jun 2020 20:45:04 +0200
Subject: [PATCH 53/75] bump version to 2019.1.2
---
README.md | 2 +-
build.conf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 43739ca..85bf9ad 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
#### Gluon versions used for specific Hamburg Freifunk Firmware builds
-- v2019.1.0.0: site-ffhh: v2019.1.0.0, gluon: v2019.1
+- v2019.1.2.0: site-ffhh: v2019.1.2.0, gluon: v2019.1.2
- v2018.2.3.0: site-ffhh: v2018.2.3.0, gluon: v2018.2.3
- v2018.2.1.0: site-ffhh: v2018.2.1.0, gluon: v2018.2.1
- v2018.1.4.2: site-ffhh: v2018.1.4.2, gluon: v2018.1.4
diff --git a/build.conf b/build.conf
index deac187..84b8c24 100644
--- a/build.conf
+++ b/build.conf
@@ -1,4 +1,4 @@
-GLUON_RELEASE="v2019.1.0.0"
+GLUON_RELEASE="v2019.1.2.0"
GLUON_BRANCH="stable"
targets="ar71xx-generic ar71xx-nand ar71xx-tiny brcm2708-bcm2708 brcm2708-bcm2709 mpc85xx-generic ramips-mt7620 ramips-mt7621 ramips-mt76x8 ramips-rt305x sunxi-cortexa7 x86-64 x86-generic x86-geode"
broken_images=(
From ccad2d2a2ba4fc36ef0f9673d8eb5471ca475ca5 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 19 Jun 2020 22:00:28 +0200
Subject: [PATCH 54/75] Bump to v2020.1.3.0
---
README.md | 1 +
build.conf | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 85bf9ad..c6fabf1 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
#### Gluon versions used for specific Hamburg Freifunk Firmware builds
+- v2020.1.3.0: site-ffhh: v2020.1.3.0, gluon: v2020.1.3
- v2019.1.2.0: site-ffhh: v2019.1.2.0, gluon: v2019.1.2
- v2018.2.3.0: site-ffhh: v2018.2.3.0, gluon: v2018.2.3
- v2018.2.1.0: site-ffhh: v2018.2.1.0, gluon: v2018.2.1
diff --git a/build.conf b/build.conf
index 84b8c24..0ca7d8a 100644
--- a/build.conf
+++ b/build.conf
@@ -1,4 +1,4 @@
-GLUON_RELEASE="v2019.1.2.0"
+GLUON_RELEASE="v2020.1.3.0"
GLUON_BRANCH="stable"
targets="ar71xx-generic ar71xx-nand ar71xx-tiny brcm2708-bcm2708 brcm2708-bcm2709 mpc85xx-generic ramips-mt7620 ramips-mt7621 ramips-mt76x8 ramips-rt305x sunxi-cortexa7 x86-64 x86-generic x86-geode"
broken_images=(
From 0d3140f32573058012f498a6f59f82b376b40ce0 Mon Sep 17 00:00:00 2001
From: bdobe <bdobe@users.noreply.github.com>
Date: Mon, 22 Jun 2020 13:17:10 +0200
Subject: [PATCH 55/75] site.conf: add channel list for 5GHz outdoor mode
---
site.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/site.conf b/site.conf
index c8ea474..d1432a8 100644
--- a/site.conf
+++ b/site.conf
@@ -31,6 +31,7 @@
wifi5 = {
channel = 44,
+ outdoor_chanlist = "100-140",
mesh = {
mcast_rate = 12000,
},
From f996941c77b9c95a2699b2c9ffc752bb59a187df Mon Sep 17 00:00:00 2001
From: Bjoern Dobe <bjoern@dobecom.de>
Date: Sat, 8 Aug 2020 12:15:35 +0200
Subject: [PATCH 56/75] site.mk: remove haveged
Remove the package haveged from site config, since it is no longer supported from Gluon
2020.2.
---
site.mk | 1 -
1 file changed, 1 deletion(-)
diff --git a/site.mk b/site.mk
index a46537b..5952e73 100644
--- a/site.mk
+++ b/site.mk
@@ -6,7 +6,6 @@ GLUON_SITE_PACKAGES := \
-gluon-config-mode-contact-info \
gluon-ebtables-source-filter \
gluon-web-mesh-vpn-fastd \
- haveged \
iptables \
iwinfo
From 8e01a9a42a05e63955bdbd559449fda789867350 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Sat, 12 Sep 2020 00:37:24 +0200
Subject: [PATCH 57/75] README update for v2020.1.4.0
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index c6fabf1..97ae8ce 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
#### Gluon versions used for specific Hamburg Freifunk Firmware builds
+- v2020.1.4.0: site-ffhh: v2020.1.4.0, gluon: v2020.1.4
- v2020.1.3.0: site-ffhh: v2020.1.3.0, gluon: v2020.1.3
- v2019.1.2.0: site-ffhh: v2019.1.2.0, gluon: v2019.1.2
- v2018.2.3.0: site-ffhh: v2018.2.3.0, gluon: v2018.2.3
From 78606aea3af1f579d721625903548047166f3278 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Wed, 16 Dec 2020 22:07:43 +0100
Subject: [PATCH 58/75] Prepare v2020.2.2.0
---
README.md | 1 +
build.conf | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 97ae8ce..99413eb 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
#### Gluon versions used for specific Hamburg Freifunk Firmware builds
+- v2020.2.2.0: site-ffhh: v2020.2.2.0, gluon: v2020.2.2
- v2020.1.4.0: site-ffhh: v2020.1.4.0, gluon: v2020.1.4
- v2020.1.3.0: site-ffhh: v2020.1.3.0, gluon: v2020.1.3
- v2019.1.2.0: site-ffhh: v2019.1.2.0, gluon: v2019.1.2
diff --git a/build.conf b/build.conf
index 0ca7d8a..3185df3 100644
--- a/build.conf
+++ b/build.conf
@@ -1,4 +1,4 @@
-GLUON_RELEASE="v2020.1.3.0"
+GLUON_RELEASE="v2020.2.2.0"
GLUON_BRANCH="stable"
targets="ar71xx-generic ar71xx-nand ar71xx-tiny brcm2708-bcm2708 brcm2708-bcm2709 mpc85xx-generic ramips-mt7620 ramips-mt7621 ramips-mt76x8 ramips-rt305x sunxi-cortexa7 x86-64 x86-generic x86-geode"
broken_images=(
From 9ddf2f6720ce6598ddf4fcd6cbaea773a35f13a1 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 17 May 2021 20:05:27 +0200
Subject: [PATCH 59/75] Prepare release of v2020.2.3.0
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index 99413eb..01cc4a6 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
#### Gluon versions used for specific Hamburg Freifunk Firmware builds
+- v2020.2.3.0: site-ffhh: v2020.2.3.0, gluon: v2020.2.3
- v2020.2.2.0: site-ffhh: v2020.2.2.0, gluon: v2020.2.2
- v2020.1.4.0: site-ffhh: v2020.1.4.0, gluon: v2020.1.4
- v2020.1.3.0: site-ffhh: v2020.1.3.0, gluon: v2020.1.3
From 28795fdd67fb9ec7bb5f22d5378f34c1ecc348a0 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 10 Jan 2022 20:28:41 +0100
Subject: [PATCH 60/75] Updates for v2021.1.1.0
---
README.md | 1 +
build.conf | 3 +--
build.sh | 13 +++++++++----
site.mk | 2 ++
4 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index 01cc4a6..8f05274 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
#### Gluon versions used for specific Hamburg Freifunk Firmware builds
+- v2021.1.1.0: site-ffhh: v2021.1.1.0, gluon: v2021.1.1
- v2020.2.3.0: site-ffhh: v2020.2.3.0, gluon: v2020.2.3
- v2020.2.2.0: site-ffhh: v2020.2.2.0, gluon: v2020.2.2
- v2020.1.4.0: site-ffhh: v2020.1.4.0, gluon: v2020.1.4
diff --git a/build.conf b/build.conf
index 3185df3..fa24547 100644
--- a/build.conf
+++ b/build.conf
@@ -1,5 +1,4 @@
-GLUON_RELEASE="v2020.2.2.0"
-GLUON_BRANCH="stable"
+GLUON_RELEASE="v2021.1.1.0"
targets="ar71xx-generic ar71xx-nand ar71xx-tiny brcm2708-bcm2708 brcm2708-bcm2709 mpc85xx-generic ramips-mt7620 ramips-mt7621 ramips-mt76x8 ramips-rt305x sunxi-cortexa7 x86-64 x86-generic x86-geode"
broken_images=(
'*dir*615*d*'
diff --git a/build.sh b/build.sh
index 4bf0eed..c907d12 100755
--- a/build.sh
+++ b/build.sh
@@ -11,6 +11,7 @@ function usage () {
echo " -a Automatically detect and build all targets." >&2
echo " -o OUT_PATH Path to the firmware output directory. Default: ${gluon_out}" >&2
echo " -s SIGNATURE Sign firmware with signature" >&2
+ echo " -stable Set GLUON_AUTOUPDATER_BRANCH=stable" >&2
echo " -b BROKEN=1" >&2
echo " -v verbose" >&2
echo " -j JOBS Run build with -jJOBS. Default: ${proc}" >&2
@@ -40,6 +41,10 @@ while [ $# -gt 0 ]; do
signature="$2"
shift
;;
+ -stable)
+ export GLUON_AUTOUPDATER_BRANCH=stable
+ shift
+ ;;
-b)
export BROKEN=1
;;
@@ -74,11 +79,11 @@ announce FFHH SITE PATH: "$site_path" >&2
pushd "$site_path"
# shellcheck source=/dev/null
. ./build.conf
-[ "${GLUON_BRANCH}" = "experimental" ] && GLUON_RELEASE="${GLUON_RELEASE}~exp$(date +%Y%m%d)"
+[ "${GLUON_AUTOUPDATER_BRANCH:-experimental}" = "experimental" ] && GLUON_RELEASE="${GLUON_RELEASE}~exp$(date +%Y%m%d)"
export GLUON_RELEASE
-export GLUON_BRANCH
+export GLUON_AUTOUPDATER_BRANCH
export GLUON_SITEDIR="${site_path}"
-export GLUON_OUTPUTDIR="${gluon_out}/${GLUON_RELEASE}/${GLUON_BRANCH}"
+export GLUON_OUTPUTDIR="${gluon_out}/${GLUON_RELEASE}/${GLUON_AUTOUPDATER_BRANCH}"
popd
pushd "${gluon_path}"
@@ -120,7 +125,7 @@ done
announce Building manifest...
make manifest
if [ -n "${signature}" ]; then
- if [ "$GLUON_BRANCH" == "experimental" ]; then
+ if [ "$GLUON_AUTOUPDATER_BRANCH" == "experimental" ]; then
announce Signing...
"${gluon_path}/contrib/sign.sh" "${signature}" "${GLUON_OUTPUTDIR}/images/sysupgrade/experimental.manifest"
else
diff --git a/site.mk b/site.mk
index 5952e73..2d6fb10 100644
--- a/site.mk
+++ b/site.mk
@@ -1,6 +1,8 @@
GLUON_MULTIDOMAIN := 1
GLUON_DEPRECATED := upgrade
+GLUON_AUTOUPDATER_ENABLED ?= 1
+
GLUON_SITE_PACKAGES := \
-gluon-config-mode-geo-location \
-gluon-config-mode-contact-info \
From cffd0a85530d8e918e6c84a3c5f4806a0061ad4b Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Tue, 11 Jan 2022 01:25:05 +0100
Subject: [PATCH 61/75] no more git on github
---
modules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules b/modules
index 6416262..d1b67ac 100644
--- a/modules
+++ b/modules
@@ -1,5 +1,5 @@
GLUON_SITE_FEEDS='ffhh_packages'
-PACKAGES_FFHH_PACKAGES_REPO=git://github.com/freifunkhamburg/ffhh-packages.git
+PACKAGES_FFHH_PACKAGES_REPO=https://github.com/freifunkhamburg/ffhh-packages.git
PACKAGES_FFHH_PACKAGES_COMMIT=ef9fcc1222f74c3c045b1450537a4b8b80efb56c
From 9647ec46934a50af371d7624a2662f699a8c8ce1 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 21 Mar 2022 21:53:35 +0100
Subject: [PATCH 62/75] Updates for v2021.1.1.0
---
build.conf | 2 +-
build.sh | 6 +++++-
modules | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/build.conf b/build.conf
index fa24547..f69fe80 100644
--- a/build.conf
+++ b/build.conf
@@ -1,5 +1,5 @@
GLUON_RELEASE="v2021.1.1.0"
-targets="ar71xx-generic ar71xx-nand ar71xx-tiny brcm2708-bcm2708 brcm2708-bcm2709 mpc85xx-generic ramips-mt7620 ramips-mt7621 ramips-mt76x8 ramips-rt305x sunxi-cortexa7 x86-64 x86-generic x86-geode"
+targets="ar71xx-generic ar71xx-nand ar71xx-tiny ath79-generic brcm2708-bcm2708 brcm2708-bcm2709 ipq40xx-generic ipq806x-generic lantiq-xrx200 lantiq-xway mpc85xx-generic mpc85xx-p1020 ramips-mt7620 ramips-mt7621 ramips-mt76x8 ramips-rt305x x86-64 x86-generic x86-geode x86-legacy"
broken_images=(
'*dir*615*d*'
)
diff --git a/build.sh b/build.sh
index c907d12..507a127 100755
--- a/build.sh
+++ b/build.sh
@@ -79,13 +79,17 @@ announce FFHH SITE PATH: "$site_path" >&2
pushd "$site_path"
# shellcheck source=/dev/null
. ./build.conf
-[ "${GLUON_AUTOUPDATER_BRANCH:-experimental}" = "experimental" ] && GLUON_RELEASE="${GLUON_RELEASE}~exp$(date +%Y%m%d)"
+GLUON_AUTOUPDATER_BRANCH="${GLUON_AUTOUPDATER_BRANCH:-experimental}"
+[ "${GLUON_AUTOUPDATER_BRANCH}" = "experimental" ] && GLUON_RELEASE="${GLUON_RELEASE}~exp$(date +%Y%m%d)"
export GLUON_RELEASE
export GLUON_AUTOUPDATER_BRANCH
export GLUON_SITEDIR="${site_path}"
export GLUON_OUTPUTDIR="${gluon_out}/${GLUON_RELEASE}/${GLUON_AUTOUPDATER_BRANCH}"
popd
+announce GLUON Variables:
+env | egrep '^GLUON' | sort
+
pushd "${gluon_path}"
announce Starting make update...
rm -rf "${GLUON_OUTPUTDIR}"
diff --git a/modules b/modules
index 6416262..d1b67ac 100644
--- a/modules
+++ b/modules
@@ -1,5 +1,5 @@
GLUON_SITE_FEEDS='ffhh_packages'
-PACKAGES_FFHH_PACKAGES_REPO=git://github.com/freifunkhamburg/ffhh-packages.git
+PACKAGES_FFHH_PACKAGES_REPO=https://github.com/freifunkhamburg/ffhh-packages.git
PACKAGES_FFHH_PACKAGES_COMMIT=ef9fcc1222f74c3c045b1450537a4b8b80efb56c
From 7ad2cd6af6d014590e7b6ef6e0d0d1ae64ca8766 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 2 May 2022 21:37:49 +0200
Subject: [PATCH 63/75] build.sh: fix broken build.sh
---
build.sh | 1 -
1 file changed, 1 deletion(-)
diff --git a/build.sh b/build.sh
index 507a127..ac09d08 100755
--- a/build.sh
+++ b/build.sh
@@ -43,7 +43,6 @@ while [ $# -gt 0 ]; do
;;
-stable)
export GLUON_AUTOUPDATER_BRANCH=stable
- shift
;;
-b)
export BROKEN=1
From 639d076417430b3ee3865fb484dc11adc43d32d4 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Tue, 3 May 2022 22:00:52 +0200
Subject: [PATCH 64/75] Add new version numbers in preparation for the security
update
---
README.md | 1 +
build.conf | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 8f05274..53cbfb6 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
#### Gluon versions used for specific Hamburg Freifunk Firmware builds
+- v2021.1.2.0: site-ffhh: v2021.1.2.0, gluon: v2021.1.2
- v2021.1.1.0: site-ffhh: v2021.1.1.0, gluon: v2021.1.1
- v2020.2.3.0: site-ffhh: v2020.2.3.0, gluon: v2020.2.3
- v2020.2.2.0: site-ffhh: v2020.2.2.0, gluon: v2020.2.2
diff --git a/build.conf b/build.conf
index f69fe80..13f862f 100644
--- a/build.conf
+++ b/build.conf
@@ -1,4 +1,4 @@
-GLUON_RELEASE="v2021.1.1.0"
+GLUON_RELEASE="v2021.1.2.0"
targets="ar71xx-generic ar71xx-nand ar71xx-tiny ath79-generic brcm2708-bcm2708 brcm2708-bcm2709 ipq40xx-generic ipq806x-generic lantiq-xrx200 lantiq-xway mpc85xx-generic mpc85xx-p1020 ramips-mt7620 ramips-mt7621 ramips-mt76x8 ramips-rt305x x86-64 x86-generic x86-geode x86-legacy"
broken_images=(
'*dir*615*d*'
From 932dfba35e47eb3097f9306e865159940ffadedd Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 17 Oct 2022 20:29:52 +0200
Subject: [PATCH 65/75] Updates for gluon v2022.1
---
README.md | 1 +
build.conf | 4 ++--
site.conf | 2 +-
site.mk | 1 -
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index 53cbfb6..773f866 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
#### Gluon versions used for specific Hamburg Freifunk Firmware builds
+- v2022.1.0.0: site-ffhh: v2022.1.0.0, gluon: v2022.1
- v2021.1.2.0: site-ffhh: v2021.1.2.0, gluon: v2021.1.2
- v2021.1.1.0: site-ffhh: v2021.1.1.0, gluon: v2021.1.1
- v2020.2.3.0: site-ffhh: v2020.2.3.0, gluon: v2020.2.3
diff --git a/build.conf b/build.conf
index 13f862f..282bef3 100644
--- a/build.conf
+++ b/build.conf
@@ -1,5 +1,5 @@
-GLUON_RELEASE="v2021.1.2.0"
-targets="ar71xx-generic ar71xx-nand ar71xx-tiny ath79-generic brcm2708-bcm2708 brcm2708-bcm2709 ipq40xx-generic ipq806x-generic lantiq-xrx200 lantiq-xway mpc85xx-generic mpc85xx-p1020 ramips-mt7620 ramips-mt7621 ramips-mt76x8 ramips-rt305x x86-64 x86-generic x86-geode x86-legacy"
+GLUON_RELEASE="v2022.1.0.0"
+targets="ath79-generic ath79-nand ath79-mikrotik bcm27xx-bcm2708 bcm27xx-bcm2709 ipq40xx-generic ipq40xx-mikrotik ipq806x-generic lantiq-xrx200 lantiq-xway mediatek-mt7622 mpc85xx-p1010 mpc85xx-p1020 ramips-mt7620 ramips-mt7621 ramips-mt76x8 rockchip-armv8 sunxi-cortexa7 x86-generic x86-geode x86-legacy x86-64"
broken_images=(
'*dir*615*d*'
)
diff --git a/site.conf b/site.conf
index d1432a8..04919a0 100644
--- a/site.conf
+++ b/site.conf
@@ -39,9 +39,9 @@
mesh_vpn = {
enabled = true,
- mtu = 1312,
fastd = {
configurable = true,
+ mtu = 1312,
methods = {'salsa2012+umac'},
groups = {
backbone = {
diff --git a/site.mk b/site.mk
index 2d6fb10..419cb23 100644
--- a/site.mk
+++ b/site.mk
@@ -8,7 +8,6 @@ GLUON_SITE_PACKAGES := \
-gluon-config-mode-contact-info \
gluon-ebtables-source-filter \
gluon-web-mesh-vpn-fastd \
- iptables \
iwinfo
GLUON_FEATURES := \
From df829eb3d03caa4f7e33222e516e4ee7890d8716 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 6 Feb 2023 20:45:11 +0100
Subject: [PATCH 66/75] Update for v2022.1.1.0
---
README.md | 2 +-
build.conf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 773f866..386cd89 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
#### Gluon versions used for specific Hamburg Freifunk Firmware builds
-- v2022.1.0.0: site-ffhh: v2022.1.0.0, gluon: v2022.1
+- v2022.1.1.0: site-ffhh: v2022.1.1.0, gluon: v2022.1.1
- v2021.1.2.0: site-ffhh: v2021.1.2.0, gluon: v2021.1.2
- v2021.1.1.0: site-ffhh: v2021.1.1.0, gluon: v2021.1.1
- v2020.2.3.0: site-ffhh: v2020.2.3.0, gluon: v2020.2.3
diff --git a/build.conf b/build.conf
index 282bef3..44a981b 100644
--- a/build.conf
+++ b/build.conf
@@ -1,4 +1,4 @@
-GLUON_RELEASE="v2022.1.0.0"
+GLUON_RELEASE="v2022.1.1.0"
targets="ath79-generic ath79-nand ath79-mikrotik bcm27xx-bcm2708 bcm27xx-bcm2709 ipq40xx-generic ipq40xx-mikrotik ipq806x-generic lantiq-xrx200 lantiq-xway mediatek-mt7622 mpc85xx-p1010 mpc85xx-p1020 ramips-mt7620 ramips-mt7621 ramips-mt76x8 rockchip-armv8 sunxi-cortexa7 x86-generic x86-geode x86-legacy x86-64"
broken_images=(
'*dir*615*d*'
From cd2d266749421eff3a9d9381c7c1df773408a093 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 20 Mar 2023 20:11:49 +0100
Subject: [PATCH 67/75] Updates for v2022.1.3.0
---
README.md | 2 +-
build.conf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 386cd89..02de4be 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
#### Gluon versions used for specific Hamburg Freifunk Firmware builds
-- v2022.1.1.0: site-ffhh: v2022.1.1.0, gluon: v2022.1.1
+- v2022.1.3.0: site-ffhh: v2022.1.3.0, gluon: v2022.1.3
- v2021.1.2.0: site-ffhh: v2021.1.2.0, gluon: v2021.1.2
- v2021.1.1.0: site-ffhh: v2021.1.1.0, gluon: v2021.1.1
- v2020.2.3.0: site-ffhh: v2020.2.3.0, gluon: v2020.2.3
diff --git a/build.conf b/build.conf
index 44a981b..7b0d90e 100644
--- a/build.conf
+++ b/build.conf
@@ -1,4 +1,4 @@
-GLUON_RELEASE="v2022.1.1.0"
+GLUON_RELEASE="v2022.1.3.0"
targets="ath79-generic ath79-nand ath79-mikrotik bcm27xx-bcm2708 bcm27xx-bcm2709 ipq40xx-generic ipq40xx-mikrotik ipq806x-generic lantiq-xrx200 lantiq-xway mediatek-mt7622 mpc85xx-p1010 mpc85xx-p1020 ramips-mt7620 ramips-mt7621 ramips-mt76x8 rockchip-armv8 sunxi-cortexa7 x86-generic x86-geode x86-legacy x86-64"
broken_images=(
'*dir*615*d*'
From e0206d03726a5537a736f69b9a4ae66b198dcd08 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 2 Feb 2024 20:05:50 +0100
Subject: [PATCH 68/75] v2022.1.4.0
---
README.md | 3 ++-
build.conf | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 02de4be..8a01a20 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,8 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
#### Gluon versions used for specific Hamburg Freifunk Firmware builds
-- v2022.1.3.0: site-ffhh: v2022.1.3.0, gluon: v2022.1.3
+- v2022.1.4.0: site-ffhh: v2022.1.4.0, gluon: v2022.1.4
+- v2022.1.3.0: site-ffhh: v2022.1.3.0, gluon: v2022.1.3 (nur experimental verteilt)
- v2021.1.2.0: site-ffhh: v2021.1.2.0, gluon: v2021.1.2
- v2021.1.1.0: site-ffhh: v2021.1.1.0, gluon: v2021.1.1
- v2020.2.3.0: site-ffhh: v2020.2.3.0, gluon: v2020.2.3
diff --git a/build.conf b/build.conf
index 7b0d90e..387c8db 100644
--- a/build.conf
+++ b/build.conf
@@ -1,4 +1,4 @@
-GLUON_RELEASE="v2022.1.3.0"
+GLUON_RELEASE="v2022.1.4.0"
targets="ath79-generic ath79-nand ath79-mikrotik bcm27xx-bcm2708 bcm27xx-bcm2709 ipq40xx-generic ipq40xx-mikrotik ipq806x-generic lantiq-xrx200 lantiq-xway mediatek-mt7622 mpc85xx-p1010 mpc85xx-p1020 ramips-mt7620 ramips-mt7621 ramips-mt76x8 rockchip-armv8 sunxi-cortexa7 x86-generic x86-geode x86-legacy x86-64"
broken_images=(
'*dir*615*d*'
From 6436e5cec6148af26bcf738da08d96cac5685ecc Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 25 Mar 2024 17:00:17 +0100
Subject: [PATCH 69/75] v2023.1.2
---
README.md | 1 +
build.conf | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 8a01a20..5f1ea19 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
#### Gluon versions used for specific Hamburg Freifunk Firmware builds
+- v2023.1.2.0: site-ffhh: v2023.1.2.0, gluon: v2023.1.2
- v2022.1.4.0: site-ffhh: v2022.1.4.0, gluon: v2022.1.4
- v2022.1.3.0: site-ffhh: v2022.1.3.0, gluon: v2022.1.3 (nur experimental verteilt)
- v2021.1.2.0: site-ffhh: v2021.1.2.0, gluon: v2021.1.2
diff --git a/build.conf b/build.conf
index 387c8db..7c44063 100644
--- a/build.conf
+++ b/build.conf
@@ -1,4 +1,4 @@
-GLUON_RELEASE="v2022.1.4.0"
+GLUON_RELEASE="v2023.1.2.0"
targets="ath79-generic ath79-nand ath79-mikrotik bcm27xx-bcm2708 bcm27xx-bcm2709 ipq40xx-generic ipq40xx-mikrotik ipq806x-generic lantiq-xrx200 lantiq-xway mediatek-mt7622 mpc85xx-p1010 mpc85xx-p1020 ramips-mt7620 ramips-mt7621 ramips-mt76x8 rockchip-armv8 sunxi-cortexa7 x86-generic x86-geode x86-legacy x86-64"
broken_images=(
'*dir*615*d*'
From 1a956e5375e11473955b490614e46e4d97fb2e48 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Tue, 26 Mar 2024 21:33:19 +0100
Subject: [PATCH 70/75] =?UTF-8?q?add=20updates=20for=20v2023.2=20from=20Bj?=
=?UTF-8?q?=C3=B6rn?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
image-customization.lua | 36 ++++++++++++++++++++++++++++++++++++
site.mk | 29 -----------------------------
2 files changed, 36 insertions(+), 29 deletions(-)
create mode 100644 image-customization.lua
diff --git a/image-customization.lua b/image-customization.lua
new file mode 100644
index 0000000..79abeed
--- /dev/null
+++ b/image-customization.lua
@@ -0,0 +1,36 @@
+features({
+ 'autoupdater',
+ 'config-mode-domain-select',
+ 'ebtables-filter-multicast',
+ 'ebtables-filter-ra-dhcp',
+ 'mesh-batman-adv-15',
+ 'mesh-vpn-fastd',
+ 'web-private-wifi',
+ 'radv-filterd',
+ 'respondd',
+ 'status-page',
+ 'web-advanced',
+ 'web-wizard',
+})
+
+if not device_class('tiny') then
+ features({
+ 'wireless-encryption-wpa3',
+ })
+end
+
+packages({
+ '-gluon-config-mode-geo-location',
+ '-gluon-config-mode-contact-info',
+ 'gluon-ebtables-source-filter',
+ 'gluon-web-mesh-vpn-fastd',
+ 'iwinfo',
+})
+
+if target('x86') then
+ packages({
+ 'nano',
+ 'htop',
+ 'ethtool',
+ })
+end
diff --git a/site.mk b/site.mk
index 419cb23..45aa428 100644
--- a/site.mk
+++ b/site.mk
@@ -3,35 +3,6 @@ GLUON_DEPRECATED := upgrade
GLUON_AUTOUPDATER_ENABLED ?= 1
-GLUON_SITE_PACKAGES := \
- -gluon-config-mode-geo-location \
- -gluon-config-mode-contact-info \
- gluon-ebtables-source-filter \
- gluon-web-mesh-vpn-fastd \
- iwinfo
-
-GLUON_FEATURES := \
- autoupdater \
- config-mode-domain-select \
- ebtables-filter-multicast \
- ebtables-filter-ra-dhcp \
- mesh-batman-adv-15 \
- mesh-vpn-fastd \
- web-private-wifi \
- radv-filterd \
- respondd \
- status-page \
- web-advanced \
- web-wizard
-
-# x86 and x86-64 add extra software
-ifeq ($(GLUON_TARGET),$(filter $(GLUON_TARGET),x86-generic x86-64))
- GLUON_SITE_PACKAGES += \
- nano \
- htop \
- ethtool
-endif
-
GLUON_PRIORITY ?= 7
# Region code required for some images; supported values: us eu
From 87e65917f87469570d966cd0e1a870b6bcc31b8f Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Tue, 26 Mar 2024 21:34:19 +0100
Subject: [PATCH 71/75] v2023.2.2.0
---
README.md | 1 +
build.conf | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 5f1ea19..a4daeb7 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
#### Gluon versions used for specific Hamburg Freifunk Firmware builds
+- v2023.2.2.0: site-ffhh: v2023.2.2.0, gluon: v2023.2.2
- v2023.1.2.0: site-ffhh: v2023.1.2.0, gluon: v2023.1.2
- v2022.1.4.0: site-ffhh: v2022.1.4.0, gluon: v2022.1.4
- v2022.1.3.0: site-ffhh: v2022.1.3.0, gluon: v2022.1.3 (nur experimental verteilt)
diff --git a/build.conf b/build.conf
index 7c44063..fa36fb5 100644
--- a/build.conf
+++ b/build.conf
@@ -1,4 +1,4 @@
-GLUON_RELEASE="v2023.1.2.0"
+GLUON_RELEASE="v2023.2.2.0"
targets="ath79-generic ath79-nand ath79-mikrotik bcm27xx-bcm2708 bcm27xx-bcm2709 ipq40xx-generic ipq40xx-mikrotik ipq806x-generic lantiq-xrx200 lantiq-xway mediatek-mt7622 mpc85xx-p1010 mpc85xx-p1020 ramips-mt7620 ramips-mt7621 ramips-mt76x8 rockchip-armv8 sunxi-cortexa7 x86-generic x86-geode x86-legacy x86-64"
broken_images=(
'*dir*615*d*'
From 6251517fe4696099b092ede352fe48e1a4f8df74 Mon Sep 17 00:00:00 2001
From: Entil_Zha <Entil_Zha@localhost.localdomain>
Date: Mon, 16 Sep 2024 19:38:57 +0200
Subject: [PATCH 72/75] add mediatek-filogic targets
---
README.md | 3 ++-
build.conf | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index a4daeb7..0a79e19 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
In the next two commands replace GLUON_VERSION and SITE_VERSION with the actual version numbers.
$ git clone -b GLUON_VERSION https://github.com/freifunk-gluon/gluon.git
- $ git clone -b SITE_VERSION https://github.com/freifunkhamburg/site-ffhh.git
+ $ git clone -b SITE_VERSION https://git.hamburg.ccc.de/freifunk/site-ffhh.git
$ cd site-ffhh
To build the firmware into the subdirectory firmware:
@@ -15,6 +15,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
#### Gluon versions used for specific Hamburg Freifunk Firmware builds
+- v2023.2.2.1: site-ffhh: v2023.2.2.0, gluon: v2023.2.2 (add mediatek-filogic Routers)
- v2023.2.2.0: site-ffhh: v2023.2.2.0, gluon: v2023.2.2
- v2023.1.2.0: site-ffhh: v2023.1.2.0, gluon: v2023.1.2
- v2022.1.4.0: site-ffhh: v2022.1.4.0, gluon: v2022.1.4
diff --git a/build.conf b/build.conf
index fa36fb5..ee3219a 100644
--- a/build.conf
+++ b/build.conf
@@ -1,5 +1,5 @@
GLUON_RELEASE="v2023.2.2.0"
-targets="ath79-generic ath79-nand ath79-mikrotik bcm27xx-bcm2708 bcm27xx-bcm2709 ipq40xx-generic ipq40xx-mikrotik ipq806x-generic lantiq-xrx200 lantiq-xway mediatek-mt7622 mpc85xx-p1010 mpc85xx-p1020 ramips-mt7620 ramips-mt7621 ramips-mt76x8 rockchip-armv8 sunxi-cortexa7 x86-generic x86-geode x86-legacy x86-64"
+targets="ath79-generic ath79-nand ath79-mikrotik bcm27xx-bcm2708 bcm27xx-bcm2709 ipq40xx-generic ipq40xx-mikrotik ipq806x-generic lantiq-xrx200 lantiq-xway mediatek-filogic mediatek-mt7622 mpc85xx-p1010 mpc85xx-p1020 ramips-mt7620 ramips-mt7621 ramips-mt76x8 rockchip-armv8 sunxi-cortexa7 x86-generic x86-geode x86-legacy x86-64"
broken_images=(
'*dir*615*d*'
)
From 9c77f1954908127d12478b8cf14878589ca20fb0 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 1 Nov 2024 20:52:11 +0100
Subject: [PATCH 73/75] v2023.2.4.0
---
README.md | 1 +
build.conf | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 0a79e19..d9e669a 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
#### Gluon versions used for specific Hamburg Freifunk Firmware builds
+- v2023.2.4.0: site-ffhh: v2023.2.4.0, gluon: v2023.2.4
- v2023.2.2.1: site-ffhh: v2023.2.2.0, gluon: v2023.2.2 (add mediatek-filogic Routers)
- v2023.2.2.0: site-ffhh: v2023.2.2.0, gluon: v2023.2.2
- v2023.1.2.0: site-ffhh: v2023.1.2.0, gluon: v2023.1.2
diff --git a/build.conf b/build.conf
index ee3219a..07358e1 100644
--- a/build.conf
+++ b/build.conf
@@ -1,4 +1,4 @@
-GLUON_RELEASE="v2023.2.2.0"
+GLUON_RELEASE="v2023.2.4.0"
targets="ath79-generic ath79-nand ath79-mikrotik bcm27xx-bcm2708 bcm27xx-bcm2709 ipq40xx-generic ipq40xx-mikrotik ipq806x-generic lantiq-xrx200 lantiq-xway mediatek-filogic mediatek-mt7622 mpc85xx-p1010 mpc85xx-p1020 ramips-mt7620 ramips-mt7621 ramips-mt76x8 rockchip-armv8 sunxi-cortexa7 x86-generic x86-geode x86-legacy x86-64"
broken_images=(
'*dir*615*d*'
From db81f77fd00b983b89154a2697a28bc1fa96f918 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 4 Nov 2024 00:49:48 +0100
Subject: [PATCH 74/75] dont nuke the output directory on each run
---
build.sh | 1 -
1 file changed, 1 deletion(-)
diff --git a/build.sh b/build.sh
index ac09d08..a91a46d 100755
--- a/build.sh
+++ b/build.sh
@@ -91,7 +91,6 @@ env | egrep '^GLUON' | sort
pushd "${gluon_path}"
announce Starting make update...
-rm -rf "${GLUON_OUTPUTDIR}"
mkdir -p "${GLUON_OUTPUTDIR}"
make update
# Try to install patches. I wasn't able to figure out how patches in gluon/site/patches work.
From b3c3b41e3099a5c3379bbbd0501975f274ca7706 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 4 Nov 2024 20:05:53 +0100
Subject: [PATCH 75/75] support BUILD_DATE for experimental versions
---
build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.sh b/build.sh
index a91a46d..5647ba5 100755
--- a/build.sh
+++ b/build.sh
@@ -79,7 +79,7 @@ pushd "$site_path"
# shellcheck source=/dev/null
. ./build.conf
GLUON_AUTOUPDATER_BRANCH="${GLUON_AUTOUPDATER_BRANCH:-experimental}"
-[ "${GLUON_AUTOUPDATER_BRANCH}" = "experimental" ] && GLUON_RELEASE="${GLUON_RELEASE}~exp$(date +%Y%m%d)"
+[ "${GLUON_AUTOUPDATER_BRANCH}" = "experimental" ] && GLUON_RELEASE="${GLUON_RELEASE}~exp${BUILD_DATE:-$(date +%Y%m%d)}"
export GLUON_RELEASE
export GLUON_AUTOUPDATER_BRANCH
export GLUON_SITEDIR="${site_path}"