jammy-amd64-tf-a-build: Install ArmClang 6.18 in the image
This is first version which supports UBL licensing and thus required to
leverage it.
Also, the TF-A build process kinda requires 6.18, except for some reason,
it was worked around by linking to 6.17 instead, see revision
013f633fd1804.
Signed-off-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
Change-Id: I5ab7029a35abf0ba741de3a94ed4d01a59ca27ec
diff --git a/jammy-amd64-tf-a-build/Dockerfile b/jammy-amd64-tf-a-build/Dockerfile
index aee9805..eee9394 100644
--- a/jammy-amd64-tf-a-build/Dockerfile
+++ b/jammy-amd64-tf-a-build/Dockerfile
@@ -66,8 +66,8 @@
COPY setup-sshd /usr/sbin/setup-sshd
# Copy armclang toolchains
-COPY DS500-BN-00026-r5p0-11rel0.tar.gz /tmp/
-COPY DS500-BN-00026-r5p0-19rel0.tar.gz /tmp/
+COPY DS500-BN-*.tar.gz /tmp/
+COPY ARMCompiler*.tar.gz /tmp/
RUN set -ex ;\
echo 'locales locales/locales_to_be_generated multiselect C.UTF-8 UTF-8, en_US.UTF-8 UTF-8 ' | debconf-set-selections ;\
diff --git a/jammy-amd64-tf-a-build/build.sh b/jammy-amd64-tf-a-build/build.sh
index 6e515c4..633a75c 100755
--- a/jammy-amd64-tf-a-build/build.sh
+++ b/jammy-amd64-tf-a-build/build.sh
@@ -20,6 +20,7 @@
# Copy armclang toolchains required for the build (previously fetched
# from s3://trustedfirmware-private/armclang/ by build harness).
cp ../DS500-BN-00026-r5p0-11rel0.tar.gz ../DS500-BN-00026-r5p0-19rel0.tar.gz .
+cp ../ARMCompiler6.18_standalone_linux-x86_64.tar.gz .
image=trustedfirmware/ci-${ARCHITECTURE}-${PROJECT}-ubuntu:${DISTRIBUTION}${DOCKER_SUFFIX}
docker build --pull --no-cache --tag=$image .
diff --git a/jammy-amd64-tf-a-build/tf-dependencies.install b/jammy-amd64-tf-a-build/tf-dependencies.install
index fd77003..4abcf81 100755
--- a/jammy-amd64-tf-a-build/tf-dependencies.install
+++ b/jammy-amd64-tf-a-build/tf-dependencies.install
@@ -66,6 +66,11 @@
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 Arm Clang 6.18 toolchain (armclang)
+mkdir -p /tmp/armclang-6.18
+tar -xf /tmp/ARMCompiler6.18_standalone_linux-x86_64.tar.gz -C /tmp/armclang-6.18
+/tmp/armclang-6.18/install_x86_64.sh --no-interactive --i-agree-to-the-contained-eula -d ${TOOLS_DIR}/armclang-6.18
+
# Install the CUE data constraint language
go install cuelang.org/go/cmd/cue@v0.5.0