From 7dfcd9b7e827bc77ba1569fe4a11a789b4873f23 Mon Sep 17 00:00:00 2001 From: Brian Cain Date: Fri, 14 Jan 2022 16:08:23 -0800 Subject: [PATCH] Update Hexagon toolchain to 13.0.1-rc2 This commit modifies the Hexagon cross container to download instead of building the toolchain. Also, we update to a newer build of the toolchain. 13.0.1-rc2 should be sufficient for validation and if all goes well, we can switch to 13.0.1 before merging this commit. Signed-off-by: Brian Cain --- tests/docker/dockerfiles/debian-hexagon-cross.docker | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/tests/docker/dockerfiles/debian-hexagon-cross.docker b/tests/docker/dockerfiles/debian-hexagon-cross.docker index 37d21e13f7..37e05e94bd 100644 --- a/tests/docker/dockerfiles/debian-hexagon-cross.docker +++ b/tests/docker/dockerfiles/debian-hexagon-cross.docker @@ -1,11 +1,7 @@ # # Docker Hexagon cross-compiler target # -# This docker target is used for building hexagon tests. As it also -# needs to be able to build QEMU itself in CI we include it's -# build-deps. It is also a "stand-alone" image so as not to be -# triggered by re-builds on other base images given it takes a long -# time to build. +# This docker target is used for building hexagon tests. # FROM qemu/debian10 @@ -19,11 +15,11 @@ RUN apt update && \ ENV TOOLCHAIN_INSTALL /usr/local ENV ROOTFS /usr/local -ENV CLANG_URL https://codelinaro.jfrog.io/artifactory/codelinaro-toolchain-for-hexagon/v2021.09.10/clang+llvm-Sept-2021-cross-hexagon-unknown-linux-musl.tar.xz +ENV CLANG_URL https://codelinaro.jfrog.io/artifactory/codelinaro-toolchain-for-hexagon/13.0.1-rc2_/clang+llvm-13.0.1-rc2-cross-hexagon-unknown-linux-musl.tar.xz RUN cd /tmp && \ wget --quiet ${CLANG_URL} && \ cd ${TOOLCHAIN_INSTALL} && \ - tar xf /tmp/clang+llvm-Sept-2021-cross-hexagon-unknown-linux-musl.tar.xz && \ - rm /tmp/clang+llvm-Sept-2021-cross-hexagon-unknown-linux-musl.tar.xz + tar xf /tmp/clang+llvm-13.0.1-rc2-cross-hexagon-unknown-linux-musl.tar.xz && \ + rm /tmp/clang+llvm-13.0.1-rc2-cross-hexagon-unknown-linux-musl.tar.xz -- 2.17.1