v2020.2.2

.gitlab-ci.yml

@@ -3,7 +3,7 @@ variables:
   GIT_SSL_CAPATH: /etc/ssl/certs/
   CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/build
   GLUON_GIT: https://github.com/freifunk-gluon/gluon.git
-  GLUON_BRANCH: v2020.1.x
+  GLUON_BRANCH: v2020.2.x
   # set to '' or 'BROKEN=1'
   BROKEN: 'BROKEN=1'
   DEPRECATED: 'upgrade'

.gitlab-ci/build.sh

@@ -164,7 +164,7 @@ fi
 # Default to build branch specific targets if parameter -t is not set 
 if [[ -z ${TARGETS+x} ]] ; then
   case "${BRANCH}" in
-    "nord-2020.1.x")
+    "nord-2020.2.x")
       # all targets
       TARGETS="ar71xx-generic ar71xx-tiny ar71xx-nand 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 sunxi-cortexa7"
       TARGETS+=" x86-generic x86-geode x86-64" # (VMs)

README.md

@@ -7,7 +7,7 @@ https://gluon.readthedocs.org/en/latest/
 
 Gluon Version auf der die Freifunk Nord Firmware basiert:
 
-* 2020.1.4 - Gluon v2020.1.x
+* 2020.2.2 - Gluon v2020.2.x
 
 # Download der Firmware
 

make-release.sh

@@ -15,7 +15,7 @@ set -u
 set -e
 
 # if version is unset, will use the default version from site.mk
-VERSION=${3:-"2020.1.4~exp$(date '+%y%m%d%H%M')"}
+VERSION=${3:-"2020.2.2~exp$(date '+%y%m%d%H%M')"}
 # branch must be set to either rc, nightly or stable
 BRANCH=${2:-"stable"}
 # must point to valid ecdsa signing key created by ecdsakeygen, relative to Gluon base directory

release

-2020.1.4-BUILD
+2020.2.2-BUILD

site.mk

@@ -3,7 +3,7 @@
 # Always call `make` from the command line with the desired release version!
 # otherwise this is generated:
 #DEFAULT_GLUON_RELEASE := 2020.2.1
-DEFAULT_GLUON_RELEASE := 2020.1.4~exp$(shell date '+%y%m%d')
+DEFAULT_GLUON_RELEASE := 2020.2.2~exp$(shell date '+%y%m%d')
 
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)

tests/validate_site.sh

@@ -3,13 +3,13 @@ set -uo pipefail
 
 # validate_site.sh checks if the site.conf is valid json
 GLUON_REPO="https://github.com/freifunk-gluon/gluon"
-GLUON_BRANCH='v2020.1.x'
+GLUON_BRANCH='v2020.2.x'
 GLUON_PACKAGES_REPO="https://github.com/freifunk-gluon/packages"
 GLUON_PACKAGES_BRANCH='v2019.1.x'
 
 P="$(pwd)"
 echo "####### check if lua5.1 is installed ..."
-which lua5.1 
+which lua5.1
 if [ "$?" == 1 ]; then
   echo lua5.1 not present!
   echo install with sudo apt install lua5.1