AVR32 CI: Commit suggestions from @simbit18

apache · Jun 5, 2024 · 3a017c0 · 3a017c0
1 parent 3565dab
commit 3a017c0
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/tools/ci/docker/linux/Dockerfile b/tools/ci/docker/linux/Dockerfile
@@ -118,6 +118,14 @@ RUN mkdir gcc-aarch64-none-elf && \
   curl -s -L  "https://developer.arm.com/-/media/Files/downloads/gnu/13.2.Rel1/binrel/arm-gnu-toolchain-13.2.Rel1-x86_64-aarch64-none-elf.tar.xz" \
   | tar -C gcc-aarch64-none-elf --strip-components 1 -xJ
 
+###############################################################################
+# Build image for tool required by AVR32 builds
+###############################################################################
+FROM nuttx-toolchain-base AS nuttx-toolchain-avr32
+# Download the prebuilt AVR32 GCC toolchain
+RUN mkdir -p gcc-avr32-gnu && \
+  git clone https://github.com/ramangopalan/avr32-gnu-toolchain-linux_x86 gcc-avr32-gnu
+
 ###############################################################################
 # Build image for tool required by Pinguino builds
 ###############################################################################
@@ -384,8 +392,8 @@ COPY --from=nuttx-toolchain-arm64 /tools/gcc-aarch64-none-elf/ gcc-aarch64-none-
 ENV PATH="/tools/gcc-aarch64-none-elf/bin:$PATH"
 
 # AVR32 toolchain
-COPY --from=nuttx-toolchain-avr32 /tools/avr32-gnu-toolchain-linux_x86/ avr32-gnu-toolchain-linux_x86/
-ENV PATH="/tools/avr32-gnu-toolchain-linux_x86/bin:$PATH"
+COPY --from=nuttx-toolchain-avr32 /tools/gcc-avr32-gnu/ gcc-avr32-gnu/
+ENV PATH="/tools/gcc-avr32-gnu/bin:$PATH"
 
 # MIPS toolchain
 COPY --from=nuttx-toolchain-pinguino /tools/pinguino-compilers/p32/ pinguino-compilers/p32/
@@ -442,6 +450,8 @@ RUN mkdir -p /tools/ccache/bin && \
   ln -sf `which ccache` /tools/ccache/bin/arm-none-eabi-g++ && \
   ln -sf `which ccache` /tools/ccache/bin/avr-gcc && \
   ln -sf `which ccache` /tools/ccache/bin/avr-g++ && \
+  ln -sf `which ccache` /tools/ccache/bin/avr32-gcc && \
+  ln -sf `which ccache` /tools/ccache/bin/avr32-g++ && \
   ln -sf `which ccache` /tools/ccache/bin/cc && \
   ln -sf `which ccache` /tools/ccache/bin/c++ && \
   ln -sf `which ccache` /tools/ccache/bin/clang && \