Skip to content

Commit b0f8d18

Browse files
Merge branch 'main' into update-gcc-14-2-tls
2 parents cfbf764 + e8b977d commit b0f8d18

File tree

291 files changed

+9400
-8090
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

291 files changed

+9400
-8090
lines changed

.devcontainer/All/Dockerfile.All

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM ghcr.io/nanoframework/dev-container-all:v2.56
1+
FROM ghcr.io/nanoframework/dev-container-all:v2.58

.devcontainer/All/Dockerfile.All.SRC

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted/gcc \
1717
&& tar -xvf /tmp/dc-downloads/gcc-arm.tar -C /tmp/dc-extracted/gcc --strip-components 1 \
1818
&& rm -rf /tmp/dc-extracted/gcc/share/doc/ /tmp/dc-extracted/gcc/share/gcc-arm-none-eabi/samples/
1919

20-
ARG CMAKE_VERSION=3.27.6
20+
ARG CMAKE_VERSION=3.31.6
2121
ARG CMAKE_SCRIPT=https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION-linux-x86_64.sh
2222
RUN wget $CMAKE_SCRIPT \
2323
-q -O /tmp/dc-downloads/cmake-install.sh \
@@ -26,7 +26,7 @@ RUN wget $CMAKE_SCRIPT \
2626
&& /tmp/dc-downloads/cmake-install.sh --skip-license --prefix=/tmp/dc-extracted/cmake \
2727
&& rm /tmp/dc-downloads/cmake-install.sh
2828

29-
# This is TI XDC tools for linux. Cheack all versions here: https://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc/index.html
29+
# This is TI XDC tools for linux. Check all versions here: https://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc/index.html
3030
ARG TI_TOOL_URL=https://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc/3_62_00_08/exports/xdccore/xdctools_3_62_00_08_core_linux.zip
3131
RUN mkdir -p /tmp/dc-extracted/titools \
3232
&& curl -o /tmp/dc-downloads/titools.zip $TI_TOOL_URL -L \
@@ -66,19 +66,19 @@ RUN mkdir -p /usr/local/bin/gcc \
6666
# Alternative source for those having issues with git svn downloads:
6767
RUN git clone --branch stable_21.11.x https://github.com/ArduPilot/ChibiOS.svn.git --depth 1 ./sources/ChibiOs
6868

69-
# Clone support repos for STM32 including AzureRTOS
69+
# Clone support repos for STM32 including Eclipse ThreadX (a.k.a. Azure RTOS)
7070
RUN git clone --branch nf-build https://github.com/nanoframework/STM32CubeL4.git --depth 1 ./sources/STM32CubeL4 \
7171
&& git clone --branch nf-build https://github.com/nanoframework/STM32CubeF7.git --depth 1 ./sources/STM32CubeF7 \
7272
&& git clone --branch nf-build https://github.com/nanoframework/STM32CubeF4.git --depth 1 ./sources/STM32CubeF4 \
7373
&& git clone --branch nf-build https://github.com/nanoframework/STM32CubeH7.git --depth 1 ./sources/STM32CubeH7 \
7474
&& git clone --branch chibios-21.11.x https://github.com/ChibiOS/ChibiOS-Contrib.git --depth 1 ./sources/ChibiOs-Contrib
7575

76-
# Clone repos for AzureRTOS
76+
# Clone repos for Eclipse ThreadX (a.k.a. Azure RTOS)
7777
RUN git clone --branch v6.4.0_rel --recursive https://github.com/eclipse-threadx/threadx.git --depth 1 ./sources/AzureRTOS \
7878
&& git clone --branch v6.3.0_rel --recursive https://github.com/eclipse-threadx/netxduo.git --depth 1 ./sources/NetxDuo
7979

8080
# Clone dependent repos (mbedtls, fatfs and littlefs)
81-
RUN git clone --branch R0.15 https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \
81+
RUN git clone --branch R0.15a https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \
8282
&& git clone --branch v2.9.3 https://github.com/littlefs-project/littlefs --depth 1 ./sources/littlefs \
8383
&& git clone --branch mbedtls-3.6.0 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
8484
&& cd ./sources/mbedtls \

.devcontainer/All/scripts/git-pull-repos.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ cd /sources/mbedtls
1818
git pull origin mbedtls-3.6.0
1919
git submodule update --init
2020
cd /sources/fatfs
21-
git pull origin R0.15
21+
git pull origin R0.15a
2222
cd /sources/FreeRTOS
2323
git pull origin V10.4.1-kernel-only
2424
cd /sources/CMSIS_5
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM ghcr.io/nanoframework/dev-container-azure-rtos:v1.33
1+
FROM ghcr.io/nanoframework/dev-container-azure-rtos:v1.35

.devcontainer/AzureRTOS/Dockerfile.AzureRTOS.SRC

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted/gcc \
1717
&& tar -xvf /tmp/dc-downloads/gcc-arm.tar -C /tmp/dc-extracted/gcc --strip-components 1 \
1818
&& rm -rf /tmp/dc-extracted/gcc/share/doc/ /tmp/dc-extracted/gcc/share/gcc-arm-none-eabi/samples/
1919

20-
ARG CMAKE_VERSION=3.27.6
20+
ARG CMAKE_VERSION=3.31.6
2121
ARG CMAKE_SCRIPT=https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION-linux-x86_64.sh
2222
RUN wget $CMAKE_SCRIPT \
2323
-q -O /tmp/dc-downloads/cmake-install.sh \
@@ -62,12 +62,12 @@ RUN git clone --branch nf-build https://github.com/nanoframework/STM32CubeL4.git
6262
&& git clone --branch nf-build https://github.com/nanoframework/STM32CubeF4.git --depth 1 ./sources/STM32CubeF4 \
6363
&& git clone --branch nf-build https://github.com/nanoframework/STM32CubeH7.git --depth 1 ./sources/STM32CubeH7
6464

65-
# Clone repos for AzureRTOS
65+
# Clone repos for Eclipse ThreadX (a.k.a. Azure RTOS)
6666
RUN git clone --branch v6.4.0_rel --recursive https://github.com/eclipse-threadx/threadx.git --depth 1 ./sources/AzureRTOS \
6767
&& git clone --branch v6.4.0_rel --recursive https://github.com/eclipse-threadx/netxduo.git --depth 1 ./sources/NetxDuo
6868

6969
# Clone dependent repos (mbedtls, fatfs and littlefs)
70-
RUN git clone --branch R0.15 https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \
70+
RUN git clone --branch R0.15a https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \
7171
&& git clone --branch v2.9.3 https://github.com/littlefs-project/littlefs --depth 1 ./sources/littlefs \
7272
&& git clone --branch mbedtls-3.6.0 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
7373
&& cd ./sources/mbedtls \
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM ghcr.io/nanoframework/dev-container-chibios:v1.34
1+
FROM ghcr.io/nanoframework/dev-container-chibios:v1.36

.devcontainer/ChibiOS/Dockerfile.ChibiOS.SRC

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted/gcc \
1717
&& tar -xvf /tmp/dc-downloads/gcc-arm.tar -C /tmp/dc-extracted/gcc --strip-components 1 \
1818
&& rm -rf /tmp/dc-extracted/gcc/share/doc/ /tmp/dc-extracted/gcc/share/gcc-arm-none-eabi/samples/
1919

20-
ARG CMAKE_VERSION=3.27.6
20+
ARG CMAKE_VERSION=3.31.6
2121
ARG CMAKE_SCRIPT=https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION-linux-x86_64.sh
2222
RUN wget $CMAKE_SCRIPT \
2323
-q -O /tmp/dc-downloads/cmake-install.sh \
@@ -65,7 +65,7 @@ RUN git clone --branch nf-build https://github.com/nanoframework/STM32CubeL4.git
6565
&& git clone --branch chibios-21.11.x https://github.com/ChibiOS/ChibiOS-Contrib.git --depth 1 ./sources/ChibiOs-Contrib
6666

6767
# Clone dependent repos (mbedtls, fatfs and littlefs etc.)
68-
RUN git clone --branch R0.15 https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \
68+
RUN git clone --branch R0.15a https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \
6969
&& git clone --branch v2.9.3 https://github.com/littlefs-project/littlefs --depth 1 ./sources/littlefs \
7070
&& git clone --branch STABLE-2_1_3_RELEASE https://github.com/lwip-tcpip/lwip.git --depth 1 ./sources/lwip \
7171
&& git clone --branch mbedtls-3.6.0 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM ghcr.io/nanoframework/dev-container-esp32:v2.35
1+
FROM ghcr.io/nanoframework/dev-container-esp32:v2.37

.devcontainer/ESP32/Dockerfile.ESP32.SRC

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN apt-get update \
99

1010
RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted
1111

12-
ARG CMAKE_VERSION=3.27.6
12+
ARG CMAKE_VERSION=3.31.6
1313
ARG CMAKE_SCRIPT=https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION-linux-x86_64.sh
1414
RUN wget $CMAKE_SCRIPT \
1515
-q -O /tmp/dc-downloads/cmake-install.sh \
@@ -45,7 +45,7 @@ RUN apt-get update \
4545
RUN mkdir -p /usr/local/bin/gcc
4646

4747
# Clone fatfs
48-
RUN git clone --branch R0.15 https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs
48+
RUN git clone --branch R0.15a https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs
4949

5050
# Clone ESP-IDF
5151
RUN git clone --branch v5.2.3 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM ghcr.io/nanoframework/dev-container-freertos-nxp:v1.06
1+
FROM ghcr.io/nanoframework/dev-container-freertos-nxp:v1.08

0 commit comments

Comments
 (0)