From 97a640bf10948f528a5c62e07673cf6037257adf Mon Sep 17 00:00:00 2001
From: Bob Idle <102661087+bobidle@users.noreply.github.com>
Date: Wed, 20 Mar 2024 07:37:19 +0100
Subject: [PATCH] Update to Gluon v2022.1.4 (#47)

---
 contrib/actions/install-dependencies.sh | 2 +-
 domains/ffef_v1.conf                    | 4 +---
 domains/ffen_v1.conf                    | 4 +---
 domains/ffgth_v1.conf                   | 4 +---
 domains/ffil_v1.conf                    | 4 +---
 domains/ffthw_v1.conf                   | 4 +---
 domains/ffwsee_v1.conf                  | 4 +---
 gluon                                   | 2 +-
 site.mk                                 | 2 +-
 9 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/contrib/actions/install-dependencies.sh b/contrib/actions/install-dependencies.sh
index 0b16182..cb70c49 100644
--- a/contrib/actions/install-dependencies.sh
+++ b/contrib/actions/install-dependencies.sh
@@ -5,7 +5,7 @@ set -e
 cp /home/runner/work/site-ffef/site-ffef/contrib/actions/sources.list /etc/apt/sources.list
 rm -rf /etc/apt/sources.list.d
 apt update
-apt install subversion build-essential libncurses-dev python2.7 python3 zlib1g-dev
+apt install subversion build-essential libncurses-dev python2.7 python3 qemu-utils zlib1g-dev
 apt clean
 rm -rf /var/lib/apt/lists/*
 dpkg -l
diff --git a/domains/ffef_v1.conf b/domains/ffef_v1.conf
index 315800f..5d0a6b0 100644
--- a/domains/ffef_v1.conf
+++ b/domains/ffef_v1.conf
@@ -43,11 +43,9 @@
   },
 
   mesh_vpn = {
-
-    mtu = 1426,
-
     fastd = {
       methods = {'null+salsa2012+umac'},
+      mtu = 1426,
       groups = {
         backbone = {
           limit = 1,
diff --git a/domains/ffen_v1.conf b/domains/ffen_v1.conf
index e6b3a5f..e338838 100644
--- a/domains/ffen_v1.conf
+++ b/domains/ffen_v1.conf
@@ -43,11 +43,9 @@
   },
 
   mesh_vpn = {
-
-    mtu = 1426,
-
     fastd = {
       methods = {'null+salsa2012+umac'},
+      mtu = 1426,
       groups = {
         backbone = {
           limit = 1,
diff --git a/domains/ffgth_v1.conf b/domains/ffgth_v1.conf
index ff63e20..5284876 100644
--- a/domains/ffgth_v1.conf
+++ b/domains/ffgth_v1.conf
@@ -43,11 +43,9 @@
   },
 
   mesh_vpn = {
-
-    mtu = 1426,
-
     fastd = {
       methods = {'null+salsa2012+umac'},
+      mtu = 1426,
       groups = {
         backbone = {
           limit = 1,
diff --git a/domains/ffil_v1.conf b/domains/ffil_v1.conf
index 1997fd0..e385425 100644
--- a/domains/ffil_v1.conf
+++ b/domains/ffil_v1.conf
@@ -43,11 +43,9 @@
   },
 
   mesh_vpn = {
-
-    mtu = 1426,
-
     fastd = {
       methods = {'null+salsa2012+umac'},
+      mtu = 1426,
       groups = {
         backbone = {
           limit = 1,
diff --git a/domains/ffthw_v1.conf b/domains/ffthw_v1.conf
index e735030..c29e4cc 100644
--- a/domains/ffthw_v1.conf
+++ b/domains/ffthw_v1.conf
@@ -43,11 +43,9 @@
   },
 
   mesh_vpn = {
-
-    mtu = 1426,
-
     fastd = {
       methods = {'null+salsa2012+umac'},
+      mtu = 1426,
       groups = {
         backbone = {
           limit = 1,
diff --git a/domains/ffwsee_v1.conf b/domains/ffwsee_v1.conf
index d5cd8cd..26fb830 100644
--- a/domains/ffwsee_v1.conf
+++ b/domains/ffwsee_v1.conf
@@ -43,11 +43,9 @@
   },
 
   mesh_vpn = {
-
-    mtu = 1426,
-
     fastd = {
       methods = {'null+salsa2012+umac'},
+      mtu = 1426,
       groups = {
         backbone = {
           limit = 1,
diff --git a/gluon b/gluon
index d0f43ae..b9a621f 160000
--- a/gluon
+++ b/gluon
@@ -1 +1 @@
-Subproject commit d0f43aeb0810bd0841c90dc1bc0c18d7aa591fa7
+Subproject commit b9a621f68c909fc1de550ce165681ae14b75d915
diff --git a/site.mk b/site.mk
index 497201f..64ab898 100644
--- a/site.mk
+++ b/site.mk
@@ -42,7 +42,7 @@ GLUON_SITE_PACKAGES := \
 #			opkg compare-versions "$1" '>>' "$2"
 #		to decide if a version is newer or not.
 
-DEFAULT_GLUON_RELEASE := 2021.1.2.1
+DEFAULT_GLUON_RELEASE := 2022.1.4
 
 # Variables set with ?= can be overwritten from the command line