sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Revert "tools/ci: patch for gcc-arm-none-eabi to 11.3.Rel1 August 08, 2022""

Browse Source 
This reverts commit 8150534a2f2faf5e65e4b7804475b1d55c9bea63.
This commit is contained in:
Xiang Xiao 2022-10-16 14:16:54 +08:00
parent 280aaa7b1d
commit b42b8c9275
2 changed files with 13 additions and 8 deletions
tools/ci
cibuild.sh
docker/linux
Dockerfile

14
tools/ci/cibuild.sh

@ -176,17 +176,19 @@ function arm-gcc-toolchain {
local flavor local flavor
case ${os} in case ${os} in
Darwin) Darwin)
flavor=mac flavor=-darwin
;; ;;
Linux) Linux)
flavor=x86_64-linux flavor=
;; ;;
esac esac
cd "${prebuilt}" 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 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
tar jxf gcc-arm-none-eabi-10.3-2021.10-${flavor}.tar.bz2 xz -d arm-gnu-toolchain-11.3.rel1${flavor}-x86_64-arm-none-eabi.tar.xz
mv gcc-arm-none-eabi-10.3-2021.10 gcc-arm-none-eabi tar xf arm-gnu-toolchain-11.3.rel1${flavor}-x86_64-arm-none-eabi.tar
rm gcc-arm-none-eabi-10.3-2021.10-${flavor}.tar.bz2 mv arm-gnu-toolchain-11.3.rel1${flavor}-x86_64-arm-none-eabi gcc-arm-none-eabi
patch -p0 < ${nuttx}/tools/ci/patch/arm-none-eabi-workaround-for-newlib-version-break.patch
rm arm-gnu-toolchain-11.3.rel1${flavor}-x86_64-arm-none-eabi.tar
fi fi
arm-none-eabi-gcc --version arm-none-eabi-gcc --version
} }

7
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 # 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 \ RUN apt-get update -qq && apt-get install -y -qq \
curl \ curl \
patch \
xz-utils xz-utils
############################################################################### ###############################################################################
@ -84,8 +85,10 @@ WORKDIR /tools
FROM nuttx-toolchain-base AS nuttx-toolchain-arm FROM nuttx-toolchain-base AS nuttx-toolchain-arm
# Download the latest ARM GCC toolchain prebuilt by ARM # Download the latest ARM GCC toolchain prebuilt by ARM
RUN mkdir gcc-arm-none-eabi && \ 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" \ 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 # Build image for tool required by ARM64 builds