From 0a9b71c6d71fb7ff99ebc12fd18ce74051240471 Mon Sep 17 00:00:00 2001
From: Malte Wedel <ich@malte.de>
Date: Tue, 25 May 2021 01:30:52 +0200
Subject: [PATCH] Enable autoupdater for "next" branch

Use GLUON_AUTOUPDATER_BRANCH instead of deprecated GLUON_BRANCH, set it to "next" for our next-branch, adapt site.conf to provide update URLs for "next" and add signing key for goligo. Autoupdate will be enabled for tagged builds (release builds), but disabled for local test builds, to avoid unwanted autoupdates while developing/testing.
---
 Makefile  | 14 +++++++++-----
 site.conf | 20 ++++++++++++--------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 5e051f4d..06016b30 100644
--- a/Makefile
+++ b/Makefile
@@ -31,11 +31,14 @@ GLUON_TARGETS ?= \
 	x86-geode \
 	x86-legacy
 
+
+GLUON_AUTOUPDATER_BRANCH := next
+
 ifneq (,$(shell git describe --exact-match --tags 2>/dev/null))
-	GLUON_BRANCH := stable
+	GLUON_AUTOUPDATER_ENABLED := 1
 	GLUON_RELEASE := $(shell git describe --tags 2>/dev/null)
 else
-	GLUON_BRANCH := experimental
+	GLUON_AUTOUPDATER_ENABLED := 0
 	EXP_FALLBACK = $(shell date '+%Y%m%d%H')
 	BUILD_NUMBER ?= $(EXP_FALLBACK)
 	GLUON_RELEASE := $(shell git describe --tags | cut -d- -f1)~next$(BUILD_NUMBER)
@@ -45,7 +48,8 @@ JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l)
 
 GLUON_MAKE := ${MAKE} -j ${JOBS} -C ${GLUON_BUILD_DIR} \
 	GLUON_RELEASE=${GLUON_RELEASE} \
-	GLUON_BRANCH=${GLUON_BRANCH}
+	GLUON_AUTOUPDATER_BRANCH=${GLUON_AUTOUPDATER_BRANCH} \
+	GLUON_AUTOUPDATER_ENABLED=${GLUON_AUTOUPDATER_ENABLED}
 
 all: info
 	${MAKE} manifest
@@ -54,7 +58,7 @@ info:
 	@echo
 	@echo '#########################'
 	@echo '# FFMUC Firmware build'
-	@echo '# Building release ${GLUON_RELEASE} for branch ${GLUON_BRANCH}'
+	@echo '# Building release ${GLUON_RELEASE} for branch ${GLUON_AUTOUPDATER_BRANCH}'
 	@echo
 
 build: gluon-prepare
@@ -68,7 +72,7 @@ manifest: build
 	mv ${GLUON_BUILD_DIR}/output .
 
 sign: manifest
-	${GLUON_BUILD_DIR}/contrib/sign.sh ${SECRET_KEY_FILE} output/images/sysupgrade/${GLUON_BRANCH}.manifest
+	${GLUON_BUILD_DIR}/contrib/sign.sh ${SECRET_KEY_FILE} output/images/sysupgrade/${GLUON_AUTOUPDATER_BRANCH}.manifest
 
 ${GLUON_BUILD_DIR}:
 	git clone ${GLUON_GIT_URL} ${GLUON_BUILD_DIR}
diff --git a/site.conf b/site.conf
index c8ee881f..2714f55f 100644
--- a/site.conf
+++ b/site.conf
@@ -51,16 +51,16 @@
 
   autoupdater = {
     enabled = 1,
-    branch = 'experimental',
+    branch = 'next',
     branches = {
-      wireguard = {
-        name = 'wireguard',
+      next = {
+        name = 'next',
         mirrors = {
-          'http://firmware.ffmuc.net/wireguard/sysupgrade',
-          'http://5.1.66.255/wireguard/sysupgrade',
-          'http://185.150.99.255/wireguard/sysupgrade',
-          'http://[2001:678:e68:f000::]/wireguard/sysupgrade',
-          'http://[2001:678:ed0:f000::]/wireguard/sysupgrade',
+          'http://firmware.ffmuc.net/next/sysupgrade',
+          'http://5.1.66.255/next/sysupgrade',
+          'http://185.150.99.255/next/sysupgrade',
+          'http://[2001:678:e68:f000::]/next/sysupgrade',
+          'http://[2001:678:ed0:f000::]/next/sysupgrade',
         },
         good_signatures = 1,
         pubkeys = {
@@ -70,6 +70,7 @@
           '216a34d34a15688e127d8d90e6c57587aa8c682b0648322f68338487657fd5ff', -- lukesix
           '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
           '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
+          '3cc6dc6d0d7499d4d17cacad5f16336634e0b26700807f29cc241eaabbde481f', -- goligo
         },
       },
       stable = {
@@ -89,6 +90,7 @@
           '216a34d34a15688e127d8d90e6c57587aa8c682b0648322f68338487657fd5ff', -- lukesix
           '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
           '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
+          '3cc6dc6d0d7499d4d17cacad5f16336634e0b26700807f29cc241eaabbde481f', -- goligo
         },
       },
       testing = {
@@ -108,6 +110,7 @@
           '216a34d34a15688e127d8d90e6c57587aa8c682b0648322f68338487657fd5ff', -- lukesix
           '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
           '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
+          '3cc6dc6d0d7499d4d17cacad5f16336634e0b26700807f29cc241eaabbde481f', -- goligo
         },
       },
       experimental = {
@@ -127,6 +130,7 @@
           '216a34d34a15688e127d8d90e6c57587aa8c682b0648322f68338487657fd5ff', -- lukesix
           '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
           '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
+          '3cc6dc6d0d7499d4d17cacad5f16336634e0b26700807f29cc241eaabbde481f', -- goligo
         },
       },
     },