From cfe2ec3d4d63615d4ad80d484b61fb9663048c3f Mon Sep 17 00:00:00 2001 From: chao an Date: Tue, 11 Oct 2022 23:36:23 +0800 Subject: [PATCH] tools/ci: Update gcc-arm-none-eabi to 11.3.Rel1 August 08, 2022 Signed-off-by: chao an --- tools/ci/cibuild.sh | 13 +++++++------ tools/ci/docker/linux/Dockerfile | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/tools/ci/cibuild.sh b/tools/ci/cibuild.sh index 73b1865890..c210bea020 100755 --- a/tools/ci/cibuild.sh +++ b/tools/ci/cibuild.sh @@ -176,17 +176,18 @@ function arm-gcc-toolchain { local flavor case ${os} in Darwin) - flavor=mac + flavor=-darwin ;; Linux) - flavor=x86_64-linux + flavor= ;; esac cd "${prebuilt}" - wget --quiet https://developer.arm.com/-/media/Files/downloads/gnu-rm/10.3-2021.10/gcc-arm-none-eabi-10.3-2021.10-${flavor}.tar.bz2 - tar jxf gcc-arm-none-eabi-10.3-2021.10-${flavor}.tar.bz2 - mv gcc-arm-none-eabi-10.3-2021.10 gcc-arm-none-eabi - rm gcc-arm-none-eabi-10.3-2021.10-${flavor}.tar.bz2 + wget --quiet https://developer.arm.com/-/media/Files/downloads/gnu/11.3.rel1/binrel/arm-gnu-toolchain-11.3.rel1${flavor}-x86_64-arm-none-eabi.tar.xz + xz -d arm-gnu-toolchain-11.3.rel1${flavor}-x86_64-arm-none-eabi.tar.xz + tar xf arm-gnu-toolchain-11.3.rel1${flavor}-x86_64-arm-none-eabi.tar + mv arm-gnu-toolchain-11.3.rel1${flavor}-x86_64-arm-none-eabi gcc-arm-none-eabi + rm arm-gnu-toolchain-11.3.rel1${flavor}-x86_64-arm-none-eabi.tar fi arm-none-eabi-gcc --version } diff --git a/tools/ci/docker/linux/Dockerfile b/tools/ci/docker/linux/Dockerfile index c74de6c7a3..6c297d222d 100644 --- a/tools/ci/docker/linux/Dockerfile +++ b/tools/ci/docker/linux/Dockerfile @@ -84,8 +84,8 @@ WORKDIR /tools FROM nuttx-toolchain-base AS nuttx-toolchain-arm # Download the latest ARM GCC toolchain prebuilt by ARM RUN mkdir gcc-arm-none-eabi && \ - curl -s -L "https://developer.arm.com/-/media/Files/downloads/gnu-rm/10.3-2021.10/gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2" \ - | tar -C gcc-arm-none-eabi --strip-components 1 -xj + curl -s -L "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 -C gcc-arm-none-eabi --strip-components 1 -xJ ############################################################################### # Build image for tool required by ARM64 builds