From 135031ee604732f8684c7cced57215188818ab88 Mon Sep 17 00:00:00 2001
From: Chris Fiege <chris@tinyhost.de>
Date: Sat, 10 Apr 2021 16:30:18 +0200
Subject: [PATCH] Finally, after all those years...
---
builder.sh | 49 +++++++++++--------------------------------------
1 file changed, 11 insertions(+), 38 deletions(-)
diff --git a/builder.sh b/builder.sh
index d41da1a..9f24bca 100755
--- a/builder.sh
+++ b/builder.sh
@@ -5,9 +5,7 @@ set -e
cd ../
# Setting environment
-# ###################
-# for v2020.1.x
-ARCHITECTURES=( \
+ARCHITECTURES_DEFAULT=" \
ar71xx-generic \
ar71xx-tiny \
ar71xx-nand \
@@ -29,40 +27,15 @@ ARCHITECTURES=( \
x86-generic \
x86-geode \
x86-64 \
-)
-
-# up to v2019.1.x
-#ARCHITECTURES=( \
-# ar71xx-tiny \
-# ar71xx-generic \
-# ar71xx-nand\
-# ar71xx-mikrotik\
-# brcm2708-bcm2708\
-# brcm2708-bcm2709\
-# ipq40xx \
-# mpc85xx-generic\
-# ramips-mt7620\
-# ramips-mt7621\
-# ramips-mt76x8\
-# ramips-rt305x\
-# sunxi-cortexa7\
-# x86-64\
-# x86-generic\
-# x86-geode\
-# )
-
-#ARCHITECTURES=( ar71xx-tiny )
-#ARCHITECTURES=( ar71xx-mikrotik )
-#ARCHITECTURES=( ar71xx-generic )
-#ARCHITECTURES=( mpc85xx-generic )
-#ARCHITECTURES=( ramips-mt76x8 )
-#ARCHITECTURES=( ipq40xx )
-#ARCHITECTURES=( x86-64 )
-#BRANCH=stable
-#BRANCH=unbranded_stable
-BRANCH=experimental
-#BRANCH=beta
-#BRANCH=parker_beta
+"
+BRANCH_DEFAULT=experimental
+
+if [ -z ${BRANCH} ]; then
+ BRANCH=$BRANCH_DEFAULT
+fi
+if [ -z ${ARCHITECTURES} ]; then
+ ARCHITECTURES=$ARCHITECTURES_DEFAULT
+fi
# prepare needed strings
GLUONVERSION=$(git describe --tags)
@@ -103,7 +76,7 @@ mkdir -p output/cmd
make update
-for ARCHITECTURE in "${ARCHITECTURES[@]}"
+for ARCHITECTURE in ${ARCHITECTURES}
do
echo "#######################################"
echo "#######################################"
--
GitLab