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] 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