From 7e10f4db9915b512adc3cb55f11dcf61f650bef8 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 28 Feb 2021 19:39:24 +0000
Subject: [PATCH] Add support for multiple targets again

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 build.sh | 86 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/build.sh b/build.sh
index d7f97c1..e5f5eb4 100755
--- a/build.sh
+++ b/build.sh
@@ -128,54 +128,54 @@ build() {
 
 	local now="$(git log --format="%ci" -1 "${commit_new}")"
 
-	local target="$(git config build.target)"
-	[ -z "${target}" ] && target="$(uname -m)"
-
-	local build_path="${UPLOAD_DIR}/${branch}/${now}-${commit_new:0:8}"
-	local build="${build_path}/${target}"
-	local status="failed"
-
-	# Remove marker
-	unlink "${dir}/.force-build"
-
-	# Ready for build: Download toolchain and sources
-	local action
-	for action in clean gettoolchain downloadsrc; do
-		if ! ./make.sh --target="${target}" "${action}"; then
-			touch "${dir}/.force-build"
-			continue
+	local target
+	for target in $(git config build.targets); do
+		local build_path="${UPLOAD_DIR}/${branch}/${now}-${commit_new:0:8}"
+		local build="${build_path}/${target}"
+		local status="failed"
+
+		# Remove marker
+		unlink "${dir}/.force-build"
+
+		# Ready for build: Download toolchain and sources
+		local action
+		for action in clean gettoolchain downloadsrc; do
+			if ! ./make.sh --target="${target}" "${action}"; then
+				touch "${dir}/.force-build"
+				continue
+			fi
+		done
+
+		# Execute the build
+		mkdir -p "${build}"
+		./make.sh --target="${target}" build | tee "${build}/build.log"
+		local ret=${PIPESTATUS[0]}
+
+		# Save the changelog
+		git log -50 > "${build}/changelog.txt"
+
+		# Save the result
+		if [ "${ret}" = "0" ]; then
+			status="success"
+			touch "${build}/.success"
+
+			# Copy images
+			mv -v *.iso *.img.gz *.img.xz *.tar.bz2 *.md5 packages/ "${build}"
+			extract_installer_from_iso "${build}"
 		fi
-	done
-
-	# Execute the build
-	mkdir -p "${build}"
-	./make.sh --target="${target}" build | tee "${build}/build.log"
-	local ret=${PIPESTATUS[0]}
+		mv -v log/ "${build}"
 
-	# Save the changelog
-	git log -50 > "${build}/changelog.txt"
+		# Cleanup the build environment
+		./make.sh --target="${target}" clean
 
-	# Save the result
-	if [ "${ret}" = "0" ]; then
-		status="success"
-		touch "${build}/.success"
-
-		# Copy images
-		mv -v *.iso *.img.gz *.img.xz *.tar.bz2 *.md5 packages/ "${build}"
-		extract_installer_from_iso "${build}"
-	fi
-	mv -v log/ "${build}"
+		# Send an email notification
+		send_email "${status}" "${target}" "${branch}" "${commit_new}" "${build}"
 
-	# Cleanup the build environment
-	./make.sh --target="${target}" clean
+		# Upload the result
+		sync
 
-	# Send an email notification
-	send_email "${status}" "${target}" "${branch}" "${commit_new}" "${build}"
-
-	# Upload the result
-	sync
-
-	popd
+		popd
+	done
 }
 
 sync() {
-- 
2.47.3