From ca801f42c10da0c9b687035fed3e1eb62e70dcf6 2021-09-13 20:24:07 From: fantawams Date: 2021-09-13 20:24:07 Subject: [PATCH] Update config to Gluon 2020.2.3 and upload of build script --- diff --git a/build_script/build-all-targets.sh b/build_script/build-all-targets.sh new file mode 100755 index 0000000000000000000000000000000000000000..c64e9d9b986e814cb4b9cfc20c724661936c3aab --- /dev/null +++ b/build_script/build-all-targets.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +if [[ $EUID -eq 0 ]]; then + echo "cannot be run as root" + exit +fi + +# detect amount of CPU cores +CORES=$(lscpu|grep -e '^CPU(s):'|xargs|cut -d" " -f2) +#CORES=1 + +# build all regular targets +for TARGET in $(make list-targets); do + make -j$CORES GLUON_TARGET=$TARGET GLUON_DEPRECATED=0 BROKEN=1 V=s +done + +make -j$CORES GLUON_TARGET=brcm2708-bcm2710 GLUON_DEPRECATED=0 BROKEN=1 V=s +make -j$CORES GLUON_TARGET=ar71xx-mikrotik GLUON_DEPRECATED=0 BROKEN=1 V=s +make -j$CORES GLUON_TARGET=mvebu-cortexa9 GLUON_DEPRECATED=0 BROKWN=1 V=s diff --git a/site_config/beta/site/site.conf b/site_config/beta/site/site.conf index a044945a8f6e12a7d8b53d1bfe0c04717e1d8c00..e8f889ae10754940cb4a28b22629414853537d02 100644 --- a/site_config/beta/site/site.conf +++ b/site_config/beta/site/site.conf @@ -31,7 +31,7 @@ -- List of NTP servers in your community. -- Must be reachable using IPv6! - ntp_servers = {'fd4e:f2d7:88d2:fffe::11','fd4e:f2d7:88d2:fffe::13'}, + ntp_servers = {'fd4e:f2d7:88d2:fffe::11','fd4e:f2d7:88d2:fffe::12'}, -- Wireless regulatory domain of your community. regdom = 'LU', @@ -103,9 +103,9 @@ key = 'd5af753220451b6c181cca469835da9c67d3ca9603465e13a5adb9b64f89f3c6', remotes = {'ipv4 "fflux-gw1.freifunk.lu" port 10000'}, }, - gw3= { - key = '8e15baeaca68163c60fe97292cb4268616e16710d51f9d4605cd70c00ad0c7eb', - remotes = {'ipv4 "fflux-gw3.c3l.lu" port 10000'}, + gw2= { + key = '3c42a77d863cb0475ec5a9e9b9c63ff557f8bac991b78a26427f100cc130462b', + remotes = {'ipv4 "fflux-gw2.freifunk.lu" port 10000'}, } }, }, @@ -126,7 +126,7 @@ -- List of mirrors to fetch images from. IPv6 required! mirrors = { 'http://[fd4e:f2d7:88d2:fffe::11]/stable/sysupgrade', - 'http://[fd4e:f2d7:88d2:fffe::13]/stable/sysupgrade', + 'http://[fd4e:f2d7:88d2:fffe::12]/stable/sysupgrade', 'http://firmware.freifunk.lu/stable/sysupgrade', }, @@ -138,9 +138,10 @@ -- List of public keys of maintainers. pubkeys = { - '4da854e34689c428c9a71e3022c598e88134bce859ae385c1f38e9131d3e9cb5', -- sid - '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgames - '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fanta + '22e564fd31849637738ab5881469ea51cd4afd181c444244eb8a8ee04df40fef', -- orimpe + '45c0d4a3d60c03f81ea75dd887474d99b29cd541f30807465e01de6c1b721b54', -- xbr + '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgamer + '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fantawams }, }, @@ -150,7 +151,7 @@ -- List of mirrors to fetch images from. IPv6 required! mirrors = { 'http://[fd4e:f2d7:88d2:fffe::11]/beta/sysupgrade', - 'http://[fd4e:f2d7:88d2:fffe::13]/beta/sysupgrade', + 'http://[fd4e:f2d7:88d2:fffe::12]/beta/sysupgrade', 'http://firmware.freifunk.lu/beta/sysupgrade', }, @@ -162,10 +163,10 @@ -- List of public keys of maintainers. pubkeys = { - '4da854e34689c428c9a71e3022c598e88134bce859ae385c1f38e9131d3e9cb5', -- sid - '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgames - '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fanta - + '22e564fd31849637738ab5881469ea51cd4afd181c444244eb8a8ee04df40fef', -- orimpe + '45c0d4a3d60c03f81ea75dd887474d99b29cd541f30807465e01de6c1b721b54', -- xbr + '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgamer + '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fantawams }, }, @@ -175,7 +176,7 @@ -- List of mirrors to fetch images from. IPv6 required! mirrors = { 'http://[fd4e:f2d7:88d2:fffe::11]/experimental/sysupgrade', - 'http://[fd4e:f2d7:88d2:fffe::13]/experimental/sysupgrade', + 'http://[fd4e:f2d7:88d2:fffe::12]/experimental/sysupgrade', 'http://firmware.freifunk.lu/experimental/sysupgrade', }, @@ -187,9 +188,10 @@ -- List of public keys of maintainers. pubkeys = { - '4da854e34689c428c9a71e3022c598e88134bce859ae385c1f38e9131d3e9cb5', -- sid - '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgames - '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fanta + '22e564fd31849637738ab5881469ea51cd4afd181c444244eb8a8ee04df40fef', -- orimpe + '45c0d4a3d60c03f81ea75dd887474d99b29cd541f30807465e01de6c1b721b54', -- xbr + '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgamer + '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fantawams }, }, @@ -222,4 +224,3 @@ tq_limit_min = '30' -- lower limit, below that the offline SSID will be used }, } - diff --git a/site_config/beta/site/site.mk b/site_config/beta/site/site.mk index 7205025cc55b601d49dc81ecad1a0df9c9552b55..3b18e9e03ef2e894bc4303b3257e20c471c57b3e 100644 --- a/site_config/beta/site/site.mk +++ b/site_config/beta/site/site.mk @@ -15,6 +15,7 @@ GLUON_FEATURES := \ respondd \ status-page \ web-advanced \ + wireless-encryption-wpa3 \ web-wizard @@ -54,7 +55,7 @@ GLUON_SITE_PACKAGES := \ # opkg compare-versions "$1" '>>' "$2" # to decide if a version is newer or not. #DEFAULT_GLUON_RELEASE := sid~exp$(shell date '+%Y%m%d') -DEFAULT_GLUON_RELEASE := 2020.2.2.0~beta20201230 +DEFAULT_GLUON_RELEASE := 2020.2.3.0~beta20210821 ## GLUON_RELEASE diff --git a/site_config/experimental/site/site.conf b/site_config/experimental/site/site.conf index a044945a8f6e12a7d8b53d1bfe0c04717e1d8c00..e8f889ae10754940cb4a28b22629414853537d02 100644 --- a/site_config/experimental/site/site.conf +++ b/site_config/experimental/site/site.conf @@ -31,7 +31,7 @@ -- List of NTP servers in your community. -- Must be reachable using IPv6! - ntp_servers = {'fd4e:f2d7:88d2:fffe::11','fd4e:f2d7:88d2:fffe::13'}, + ntp_servers = {'fd4e:f2d7:88d2:fffe::11','fd4e:f2d7:88d2:fffe::12'}, -- Wireless regulatory domain of your community. regdom = 'LU', @@ -103,9 +103,9 @@ key = 'd5af753220451b6c181cca469835da9c67d3ca9603465e13a5adb9b64f89f3c6', remotes = {'ipv4 "fflux-gw1.freifunk.lu" port 10000'}, }, - gw3= { - key = '8e15baeaca68163c60fe97292cb4268616e16710d51f9d4605cd70c00ad0c7eb', - remotes = {'ipv4 "fflux-gw3.c3l.lu" port 10000'}, + gw2= { + key = '3c42a77d863cb0475ec5a9e9b9c63ff557f8bac991b78a26427f100cc130462b', + remotes = {'ipv4 "fflux-gw2.freifunk.lu" port 10000'}, } }, }, @@ -126,7 +126,7 @@ -- List of mirrors to fetch images from. IPv6 required! mirrors = { 'http://[fd4e:f2d7:88d2:fffe::11]/stable/sysupgrade', - 'http://[fd4e:f2d7:88d2:fffe::13]/stable/sysupgrade', + 'http://[fd4e:f2d7:88d2:fffe::12]/stable/sysupgrade', 'http://firmware.freifunk.lu/stable/sysupgrade', }, @@ -138,9 +138,10 @@ -- List of public keys of maintainers. pubkeys = { - '4da854e34689c428c9a71e3022c598e88134bce859ae385c1f38e9131d3e9cb5', -- sid - '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgames - '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fanta + '22e564fd31849637738ab5881469ea51cd4afd181c444244eb8a8ee04df40fef', -- orimpe + '45c0d4a3d60c03f81ea75dd887474d99b29cd541f30807465e01de6c1b721b54', -- xbr + '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgamer + '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fantawams }, }, @@ -150,7 +151,7 @@ -- List of mirrors to fetch images from. IPv6 required! mirrors = { 'http://[fd4e:f2d7:88d2:fffe::11]/beta/sysupgrade', - 'http://[fd4e:f2d7:88d2:fffe::13]/beta/sysupgrade', + 'http://[fd4e:f2d7:88d2:fffe::12]/beta/sysupgrade', 'http://firmware.freifunk.lu/beta/sysupgrade', }, @@ -162,10 +163,10 @@ -- List of public keys of maintainers. pubkeys = { - '4da854e34689c428c9a71e3022c598e88134bce859ae385c1f38e9131d3e9cb5', -- sid - '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgames - '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fanta - + '22e564fd31849637738ab5881469ea51cd4afd181c444244eb8a8ee04df40fef', -- orimpe + '45c0d4a3d60c03f81ea75dd887474d99b29cd541f30807465e01de6c1b721b54', -- xbr + '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgamer + '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fantawams }, }, @@ -175,7 +176,7 @@ -- List of mirrors to fetch images from. IPv6 required! mirrors = { 'http://[fd4e:f2d7:88d2:fffe::11]/experimental/sysupgrade', - 'http://[fd4e:f2d7:88d2:fffe::13]/experimental/sysupgrade', + 'http://[fd4e:f2d7:88d2:fffe::12]/experimental/sysupgrade', 'http://firmware.freifunk.lu/experimental/sysupgrade', }, @@ -187,9 +188,10 @@ -- List of public keys of maintainers. pubkeys = { - '4da854e34689c428c9a71e3022c598e88134bce859ae385c1f38e9131d3e9cb5', -- sid - '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgames - '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fanta + '22e564fd31849637738ab5881469ea51cd4afd181c444244eb8a8ee04df40fef', -- orimpe + '45c0d4a3d60c03f81ea75dd887474d99b29cd541f30807465e01de6c1b721b54', -- xbr + '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgamer + '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fantawams }, }, @@ -222,4 +224,3 @@ tq_limit_min = '30' -- lower limit, below that the offline SSID will be used }, } - diff --git a/site_config/experimental/site/site.mk b/site_config/experimental/site/site.mk index 3082dc43a47dd39ddf4634e8b006d70a14d937a3..d509896e510dc47009a76756182fa16460a8f37d 100644 --- a/site_config/experimental/site/site.mk +++ b/site_config/experimental/site/site.mk @@ -15,6 +15,7 @@ GLUON_FEATURES := \ respondd \ status-page \ web-advanced \ + wireless-encryption-wpa3 \ web-wizard @@ -54,7 +55,7 @@ GLUON_SITE_PACKAGES := \ # opkg compare-versions "$1" '>>' "$2" # to decide if a version is newer or not. #DEFAULT_GLUON_RELEASE := sid~exp$(shell date '+%Y%m%d') -DEFAULT_GLUON_RELEASE := 2020.2.2.3~exp20201229 +DEFAULT_GLUON_RELEASE := 2020.2.3.0~exp20210618 ## GLUON_RELEASE diff --git a/site_config/stable/site/site.conf b/site_config/stable/site/site.conf index a044945a8f6e12a7d8b53d1bfe0c04717e1d8c00..e8f889ae10754940cb4a28b22629414853537d02 100644 --- a/site_config/stable/site/site.conf +++ b/site_config/stable/site/site.conf @@ -31,7 +31,7 @@ -- List of NTP servers in your community. -- Must be reachable using IPv6! - ntp_servers = {'fd4e:f2d7:88d2:fffe::11','fd4e:f2d7:88d2:fffe::13'}, + ntp_servers = {'fd4e:f2d7:88d2:fffe::11','fd4e:f2d7:88d2:fffe::12'}, -- Wireless regulatory domain of your community. regdom = 'LU', @@ -103,9 +103,9 @@ key = 'd5af753220451b6c181cca469835da9c67d3ca9603465e13a5adb9b64f89f3c6', remotes = {'ipv4 "fflux-gw1.freifunk.lu" port 10000'}, }, - gw3= { - key = '8e15baeaca68163c60fe97292cb4268616e16710d51f9d4605cd70c00ad0c7eb', - remotes = {'ipv4 "fflux-gw3.c3l.lu" port 10000'}, + gw2= { + key = '3c42a77d863cb0475ec5a9e9b9c63ff557f8bac991b78a26427f100cc130462b', + remotes = {'ipv4 "fflux-gw2.freifunk.lu" port 10000'}, } }, }, @@ -126,7 +126,7 @@ -- List of mirrors to fetch images from. IPv6 required! mirrors = { 'http://[fd4e:f2d7:88d2:fffe::11]/stable/sysupgrade', - 'http://[fd4e:f2d7:88d2:fffe::13]/stable/sysupgrade', + 'http://[fd4e:f2d7:88d2:fffe::12]/stable/sysupgrade', 'http://firmware.freifunk.lu/stable/sysupgrade', }, @@ -138,9 +138,10 @@ -- List of public keys of maintainers. pubkeys = { - '4da854e34689c428c9a71e3022c598e88134bce859ae385c1f38e9131d3e9cb5', -- sid - '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgames - '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fanta + '22e564fd31849637738ab5881469ea51cd4afd181c444244eb8a8ee04df40fef', -- orimpe + '45c0d4a3d60c03f81ea75dd887474d99b29cd541f30807465e01de6c1b721b54', -- xbr + '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgamer + '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fantawams }, }, @@ -150,7 +151,7 @@ -- List of mirrors to fetch images from. IPv6 required! mirrors = { 'http://[fd4e:f2d7:88d2:fffe::11]/beta/sysupgrade', - 'http://[fd4e:f2d7:88d2:fffe::13]/beta/sysupgrade', + 'http://[fd4e:f2d7:88d2:fffe::12]/beta/sysupgrade', 'http://firmware.freifunk.lu/beta/sysupgrade', }, @@ -162,10 +163,10 @@ -- List of public keys of maintainers. pubkeys = { - '4da854e34689c428c9a71e3022c598e88134bce859ae385c1f38e9131d3e9cb5', -- sid - '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgames - '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fanta - + '22e564fd31849637738ab5881469ea51cd4afd181c444244eb8a8ee04df40fef', -- orimpe + '45c0d4a3d60c03f81ea75dd887474d99b29cd541f30807465e01de6c1b721b54', -- xbr + '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgamer + '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fantawams }, }, @@ -175,7 +176,7 @@ -- List of mirrors to fetch images from. IPv6 required! mirrors = { 'http://[fd4e:f2d7:88d2:fffe::11]/experimental/sysupgrade', - 'http://[fd4e:f2d7:88d2:fffe::13]/experimental/sysupgrade', + 'http://[fd4e:f2d7:88d2:fffe::12]/experimental/sysupgrade', 'http://firmware.freifunk.lu/experimental/sysupgrade', }, @@ -187,9 +188,10 @@ -- List of public keys of maintainers. pubkeys = { - '4da854e34689c428c9a71e3022c598e88134bce859ae385c1f38e9131d3e9cb5', -- sid - '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgames - '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fanta + '22e564fd31849637738ab5881469ea51cd4afd181c444244eb8a8ee04df40fef', -- orimpe + '45c0d4a3d60c03f81ea75dd887474d99b29cd541f30807465e01de6c1b721b54', -- xbr + '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgamer + '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fantawams }, }, @@ -222,4 +224,3 @@ tq_limit_min = '30' -- lower limit, below that the offline SSID will be used }, } - diff --git a/site_config/stable/site/site.mk b/site_config/stable/site/site.mk index a70c2758a76482352c16cd46282a325847253839..f950a4536d0f39e57cbc98e30c736832e894467c 100644 --- a/site_config/stable/site/site.mk +++ b/site_config/stable/site/site.mk @@ -15,6 +15,7 @@ GLUON_FEATURES := \ respondd \ status-page \ web-advanced \ + wireless-encryption-wpa3 \ web-wizard @@ -54,7 +55,7 @@ GLUON_SITE_PACKAGES := \ # opkg compare-versions "$1" '>>' "$2" # to decide if a version is newer or not. #DEFAULT_GLUON_RELEASE := sid~exp$(shell date '+%Y%m%d') -DEFAULT_GLUON_RELEASE := 2020.2.2~stable202101 +DEFAULT_GLUON_RELEASE := 2020.2.3~stable202108 ## GLUON_RELEASE