bionic-amd64-tf-a-build: Switch to use armclang's from S3 bucket
Arm Clang toolchains are no longer accessible via straight HTTP requests.
Instead, they are mirrored to an S3 bucket, files from which are made
available to build.sh, which in turn makes them available to Dockerfile.
Also, Arm Clang 6.8 is no longer accessible via the Arm download site,
so instead use 6.9.
Signed-off-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
Change-Id: I9639c49a1ba6cd44df03a546193af4a6498c23de
diff --git a/bionic-amd64-tf-a-build/tf-dependencies.install b/bionic-amd64-tf-a-build/tf-dependencies.install
index 0472069..3c304f4 100755
--- a/bionic-amd64-tf-a-build/tf-dependencies.install
+++ b/bionic-amd64-tf-a-build/tf-dependencies.install
@@ -44,20 +44,27 @@
https://releases.linaro.org/components/toolchain/binaries/6.2-2016.11/aarch64-linux-gnu/gcc-linaro-6.2.1-2016.11-x86_64_aarch64-linux-gnu.tar.xz
tar -Jxf /tmp/gcc-linaro-x86_64_aarch64-linux-gnu.tar.xz -C ${TOOLS_DIR}
-# Install Arm Clang 6.8 toolchain (armclang)
+# 2022-11-11: No longer available at Arm download page
+## Install Arm Clang 6.8 toolchain (armclang)
+## NOTE: Toolchain is not available through PATH so to use it, CC should point to
+## CC=${TOOLS_DIR}/armclang-6.8/bin/armclang
+#mkdir -p /tmp/armclang-6.8
+#wget -O /tmp/DS500-BN-00026-r5p0-10rel0.tgz \
+# -q https://developer.arm.com/-/media/Files/downloads/compiler/DS500-BN-00026-r5p0-10rel0.tgz
+#tar -xf /tmp/DS500-BN-00026-r5p0-10rel0.tgz -C /tmp/armclang-6.8
+#/tmp/armclang-6.8/install_x86_64.sh --no-interactive --i-agree-to-the-contained-eula -d ${TOOLS_DIR}/armclang-6.8
+
+# This replaces unavailable Arm Clang 6.8 above
+# Install Arm Clang 6.9 toolchain (armclang)
# NOTE: Toolchain is not available through PATH so to use it, CC should point to
-# CC=${TOOLS_DIR}/armclang-6.8/bin/armclang
-mkdir -p /tmp/armclang-6.8
-wget -O /tmp/DS500-BN-00026-r5p0-10rel0.tgz \
- -q https://developer.arm.com/-/media/Files/downloads/compiler/DS500-BN-00026-r5p0-10rel0.tgz
-tar -xf /tmp/DS500-BN-00026-r5p0-10rel0.tgz -C /tmp/armclang-6.8
-/tmp/armclang-6.8/install_x86_64.sh --no-interactive --i-agree-to-the-contained-eula -d ${TOOLS_DIR}/armclang-6.8
+# CC=${TOOLS_DIR}/armclang-6.9/bin/armclang
+mkdir -p /tmp/armclang-6.9
+tar -xf /tmp/DS500-BN-00026-r5p0-11rel0.tar.gz -C /tmp/armclang-6.9
+/tmp/armclang-6.9/install_x86_64.sh --no-interactive --i-agree-to-the-contained-eula -d ${TOOLS_DIR}/armclang-6.9
# Install Arm Clang 6.17 toolchain (armclang)
mkdir -p /tmp/armclang-6.17
-wget -O /tmp/DS500-BN-00026-r5p0-19rel0.tgz \
- -q https://developer.arm.com/-/media/Files/downloads/compiler/DS500-BN-00026-r5p0-19rel0.tgz
-tar -xf /tmp/DS500-BN-00026-r5p0-19rel0.tgz -C /tmp/armclang-6.17
+tar -xf /tmp/DS500-BN-00026-r5p0-19rel0.tar.gz -C /tmp/armclang-6.17
/tmp/armclang-6.17/install_x86_64.sh --no-interactive --i-agree-to-the-contained-eula -d ${TOOLS_DIR}/armclang-6.17
# Install LLVM Clang toolchain (clang)