Jammy: bring in dependency updates from Bionic image
There has been work to update dependencies on the Bionic image that has
not propagated to the Jammy image. Bring them in to be in line
Signed-off-by: Boyan Karatotev <boyan.karatotev@arm.com>
Change-Id: If8ee63687db71fb333b618a7e77debd69c998471
diff --git a/jammy-amd64-tf-a-build/Dockerfile b/jammy-amd64-tf-a-build/Dockerfile
index 03d5028..97de3d4 100644
--- a/jammy-amd64-tf-a-build/Dockerfile
+++ b/jammy-amd64-tf-a-build/Dockerfile
@@ -63,7 +63,7 @@
# Copy armclang toolchains
COPY DS500-BN-00026-r5p0-11rel0.tar.gz /tmp/
-COPY DS500-BN-00026-r5p0-15rel0.tar.gz /tmp/
+COPY DS500-BN-00026-r5p0-19rel0.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 02430d7..6e515c4 100755
--- a/jammy-amd64-tf-a-build/build.sh
+++ b/jammy-amd64-tf-a-build/build.sh
@@ -19,7 +19,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-15rel0.tar.gz .
+cp ../DS500-BN-00026-r5p0-11rel0.tar.gz ../DS500-BN-00026-r5p0-19rel0.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 7d75306..d393491 100755
--- a/jammy-amd64-tf-a-build/tf-dependencies.install
+++ b/jammy-amd64-tf-a-build/tf-dependencies.install
@@ -23,7 +23,7 @@
# Install Arm GCC toolchain (arm-none-eabi GNU-A)
curl --connect-timeout 15 --retry 5 --create-dirs -fsSLo /tmp/gcc-arm-x86_64-arm-none-eabi.tar.xz \
- https://developer.arm.com/-/media/Files/downloads/gnu/11.2-2022.02/binrel/gcc-arm-11.2-2022.02-x86_64-arm-none-eabi.tar.xz
+ https://developer.arm.com/-/media/Files/downloads/gnu/11.3.Rel1/binrel/arm-gnu-toolchain-11.3.rel1-x86_64-arm-none-eabi.tar.xz
tar -Jxf /tmp/gcc-arm-x86_64-arm-none-eabi.tar.xz -C ${TOOLS_DIR} --strip-components=1
# Install Arm GCC toolchain (arm-none-eabi GNU-RM)
@@ -34,7 +34,7 @@
# Install Arm GCC toolchain (aarch64-none-elf)
curl --connect-timeout 15 --retry 5 --create-dirs -fsSLo /tmp/gcc-arm-x86_64-aarch64-none-elf.tar.xz \
- https://developer.arm.com/-/media/Files/downloads/gnu/11.2-2022.02/binrel/gcc-arm-11.2-2022.02-x86_64-aarch64-none-elf.tar.xz
+ https://developer.arm.com/-/media/Files/downloads/gnu/11.3.Rel1/binrel/arm-gnu-toolchain-11.3.rel1-x86_64-aarch64-none-elf.tar.xz
tar -Jxf /tmp/gcc-arm-x86_64-aarch64-none-elf.tar.xz -C ${TOOLS_DIR} --strip-components=1
# Install Linaro GCC 6.2.1 toolchain (aarch64-none-elf), which is required by some platforms, i.e. marvell
@@ -61,10 +61,10 @@
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.13 (armclang)
-mkdir -p /tmp/armclang-6.13
-tar -xf /tmp/DS500-BN-00026-r5p0-15rel0.tar.gz -C /tmp/armclang-6.13
-/tmp/armclang-6.13/install_x86_64.sh --no-interactive --i-agree-to-the-contained-eula -d ${TOOLS_DIR}
+# Install Arm Clang 6.17 toolchain (armclang)
+mkdir -p /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)
curl --connect-timeout 5 --retry 5 --create-dirs -fsSLo /tmp/clang+llvm-10.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz \
@@ -82,10 +82,10 @@
rm -f *.zip
# Install OpenSSL 3.0
-OPENSSL_VER="3.0.2"
+OPENSSL_VER="3.0.7"
OPENSSL_DIRNAME="openssl-${OPENSSL_VER}"
OPENSSL_FILENAME="openssl-${OPENSSL_VER}"
-OPENSSL_CHECKSUM="98e91ccead4d4756ae3c9cde5e09191a8e586d9f4d50838e7ec09d6411dfdb63"
+OPENSSL_CHECKSUM="83049d042a260e696f62406ac5c08bf706fd84383f945cf21bd61e9ed95c396e"
curl --connect-timeout 5 --retry 5 --create-dirs -fsSLo /tmp/${OPENSSL_FILENAME}.tar.gz \
https://www.openssl.org/source/${OPENSSL_FILENAME}.tar.gz
echo "${OPENSSL_CHECKSUM} /tmp/${OPENSSL_FILENAME}.tar.gz" | sha256sum -c