From 2da058ed7b826dc3a94a748c3f70d8238dd1192c Mon Sep 17 00:00:00 2001
From: Jianyong Wu <jianyong.wu@arm.com>
Date: Tue, 2 Mar 2021 16:28:53 +0800
Subject: [PATCH] osbuild: build musl toolchain from source if needed

Currently, musl toolchain installation on arm64 is just downloading from
a website. It's unsafe in case the website corrupts. So build musl
toolchain from source if it can't be downloaded.

Fixes: #1481
Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
---
 ci/install_musl.sh             |  9 +++++----
 tools/osbuilder/scripts/lib.sh | 15 ++++++++++++---
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/ci/install_musl.sh b/ci/install_musl.sh
index 30d2d642b5..15f4769491 100755
--- a/ci/install_musl.sh
+++ b/ci/install_musl.sh
@@ -12,10 +12,11 @@ install_aarch64_musl() {
 		local musl_tar="${arch}-linux-musl-native.tgz"
 		local musl_dir="${arch}-linux-musl-native"
 		pushd /tmp
-		curl -sLO https://musl.cc/${musl_tar}
-		tar -zxf ${musl_tar}
-		mkdir -p /usr/local/musl/
-		cp -r ${musl_dir}/* /usr/local/musl/
+		if curl -sLO --fail https://musl.cc/${musl_tar}; then
+			tar -zxf ${musl_tar}
+			mkdir -p /usr/local/musl/
+			cp -r ${musl_dir}/* /usr/local/musl/
+		fi
 		popd
 	fi
 }
diff --git a/tools/osbuilder/scripts/lib.sh b/tools/osbuilder/scripts/lib.sh
index bde0d4658a..7938a3432a 100644
--- a/tools/osbuilder/scripts/lib.sh
+++ b/tools/osbuilder/scripts/lib.sh
@@ -274,15 +274,24 @@ ENV PATH=\$PATH:\$GOROOT/bin:\$GOPATH/bin
 	# Rust agent
 	# rust installer should set path apropiately, just in case
 	# install musl for compiling rust-agent
+	local musl_source_url="https://git.zv.io/toolchains/musl-cross-make.git"
+	local musl_source_dir="musl-cross-make"
 	install_musl=
 	if [ "${muslarch}" == "aarch64" ]; then
 		local musl_tar="${muslarch}-linux-musl-native.tgz"
 		local musl_dir="${muslarch}-linux-musl-native"
+		local aarch64_musl_target="aarch64-linux-musl"
 		install_musl="
 RUN cd /tmp; \
-	curl -sLO https://musl.cc/${musl_tar}; tar -zxf ${musl_tar}; \
-	 mkdir -p /usr/local/musl/; \
-	cp -r ${musl_dir}/* /usr/local/musl/
+	mkdir -p /usr/local/musl/; \
+	if curl -sLO --fail https://musl.cc/${musl_tar}; then \
+	cp -r ${musl_dir}/* /usr/local/musl/; \
+	else \
+		git clone ${musl_source_url}; \
+		TARGET=${aarch64_musl_target} make -j$(nproc) -C ${musl_source_dir} install; \
+		cp -r ${musl_source_dir}/output/* /usr/local/musl/; \
+		cp /usr/local/musl/bin/aarch64-linux-musl-g++ /usr/local/musl/bin/g++; \
+	fi
 ENV PATH=\$PATH:/usr/local/musl/bin
 RUN ln -sf /usr/local/musl/bin/g++ /usr/bin/g++
 "