Skip to content

Commit

Permalink
Upgrade Arm GNU toolchain and GCC to version 13 (#66)
Browse files Browse the repository at this point in the history
  • Loading branch information
PatrickKa authored Dec 13, 2024
2 parents de278b8 + 99830a2 commit dd4b301
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
12 changes: 6 additions & 6 deletions full/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ FROM tuwienspaceteam/sts1-cobc:latest-linux-x86
RUN apt-get update -qq && apt-get install -y sudo -qq

# Install toolchain
RUN wget https://developer.arm.com/-/media/Files/downloads/gnu/12.2.rel1/binrel/arm-gnu-toolchain-12.2.rel1-x86_64-arm-none-eabi.tar.xz -nv \
&& wget https://developer.arm.com/-/media/Files/downloads/gnu/12.2.rel1/binrel/arm-gnu-toolchain-12.2.rel1-x86_64-arm-none-eabi.tar.xz.sha256asc -nv \
&& sha256sum --check arm-gnu-toolchain-12.2.rel1-x86_64-arm-none-eabi.tar.xz.sha256asc \
&& tar -xvf arm-gnu-toolchain-12.2.rel1-x86_64-arm-none-eabi.tar.xz -C /opt \
&& rm arm-gnu-toolchain-12.2.rel1-x86_64-arm-none-eabi.tar.xz arm-gnu-toolchain-12.2.rel1-x86_64-arm-none-eabi.tar.xz.sha256asc
RUN wget https://developer.arm.com/-/media/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi.tar.xz -nv \
&& wget https://developer.arm.com/-/media/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi.tar.xz.sha256asc -nv \
&& sha256sum --check arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi.tar.xz.sha256asc \
&& tar -xvf arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi.tar.xz -C /opt \
&& rm arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi.tar.xz arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi.tar.xz.sha256asc

ENV PATH="/opt/arm-gnu-toolchain-12.2.rel1-x86_64-arm-none-eabi/bin:${PATH}"
ENV PATH="/opt/arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi/bin:${PATH}"

RUN GCC_VERSION=$(gcc -dumpfullversion | awk -F. '{print $1}') \
&& ARM_GCC_VERSION=$(arm-none-eabi-gcc -dumpfullversion | awk -F. '{print $1}') \
Expand Down
2 changes: 1 addition & 1 deletion libraries.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
rodos,a76e5ac33397273c08ac9e247a7ea2308e160801,https://github.com/SpaceTeam/rodos.git
etl,cceb5038664a4fa363e79709bc08bd0bb356ae50,https://github.com/ETLCPP/etl.git
Catch2,v3.1.0,https://github.com/catchorg/Catch2.git
Catch2,v3.3.0,https://github.com/catchorg/Catch2.git
littlefs,8e53bfeda7716ed7056a2b519bba45f40dea7df0,https://github.com/SpaceTeam/littlefs.git
strong_type,v15,https://github.com/rollbear/strong_type.git
include-what-you-use,0.19,https://github.com/include-what-you-use/include-what-you-use.git
20 changes: 10 additions & 10 deletions linux-x86/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ RUN dpkg --add-architecture i386 && apt-get update -qq && apt-get install -y -qq
clang-tidy-15 \
clangd-15 \
cppcheck \
g++-12 \
g++-12-multilib \
gcc-12 \
gcc-12-multilib \
g++-13 \
g++-13-multilib \
gcc-13 \
gcc-13-multilib \
gdb \
git \
lcov \
Expand All @@ -30,12 +30,12 @@ RUN dpkg --add-architecture i386 && apt-get update -qq && apt-get install -y -qq
&& rm -rf /var/lib/apt/lists/*

# Setup tools versions
RUN update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-15 99
RUN update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-15 99
RUN update-alternatives --install /usr/bin/clangd clangd /usr/bin/clangd-15 99
RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 99
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 99
RUN update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-12 99
RUN update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-15 15
RUN update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-15 15
RUN update-alternatives --install /usr/bin/clangd clangd /usr/bin/clangd-15 15
RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-13 13
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 13
RUN update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-13 13

# Install CMake 3.22
RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.0/cmake-3.22.0-linux-x86_64.tar.gz -q
Expand Down

0 comments on commit dd4b301

Please sign in to comment.