From 53dd0819cf4317f24e081aa0175d1c4ef3fa4c57 Mon Sep 17 00:00:00 2001 From: chao an Date: Wed, 12 Oct 2022 22:30:44 +0800 Subject: [PATCH] tools/ci: patch for docker gcc-arm-none-eabi to 11.3.Rel1 August 08, 2022 Fix Wrong Newlib version strings, error when stdlib.h is included Reference: https://community.arm.com/support-forums/f/compilers-and-libraries-forum/53470/arm-gnu-toolchain-11-3-rel1-x86_64-arm-none-eabi-wrong-newlib-version-strings-error-when-stdlib-h-is-included Signed-off-by: chao an --- tools/ci/docker/linux/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/ci/docker/linux/Dockerfile b/tools/ci/docker/linux/Dockerfile index 6c297d222d..c98dadf62c 100644 --- a/tools/ci/docker/linux/Dockerfile +++ b/tools/ci/docker/linux/Dockerfile @@ -18,6 +18,7 @@ FROM ubuntu:20.04 AS builder-base # This should only be used for temp build images that artifacts will be copied from RUN apt-get update -qq && apt-get install -y -qq \ curl \ + patch \ xz-utils ############################################################################### @@ -85,7 +86,9 @@ 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/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 + | tar -C gcc-arm-none-eabi --strip-components 1 -xJ \ + && curl -s -L -O "https://raw.githubusercontent.com/apache/incubator-nuttx/master/tools/ci/patch/arm-none-eabi-workaround-for-newlib-version-break.patch" \ + && patch -p0 < arm-none-eabi-workaround-for-newlib-version-break.patch ############################################################################### # Build image for tool required by ARM64 builds