Skip to content

Commit 2660092

Browse files
authored
Fix Mbed TLS clone step (#3000)
***NO_CI** [no ci]
1 parent 7f9c23c commit 2660092

File tree

5 files changed

+21
-12
lines changed

5 files changed

+21
-12
lines changed

.devcontainer/All/Dockerfile.All.SRC

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,11 @@ RUN git clone --branch v6.4.0_rel --recursive https://github.com/eclipse-threadx
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 mbedtls-3.6.0 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
82-
&& git clone --branch R0.15 https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \
83-
&& git clone --branch v2.9.3 https://github.com/littlefs-project/littlefs --depth 1 ./sources/littlefs
81+
RUN git clone --branch R0.15 https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \
82+
&& git clone --branch v2.9.3 https://github.com/littlefs-project/littlefs --depth 1 ./sources/littlefs \
83+
&& git clone --branch mbedtls-3.6.0 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
84+
&& cd ./sources/mbedtls \
85+
&& git submodule update --init --recursive
8486

8587
# Clone FreeRTOS and what is needed for ESP32
8688
RUN git clone --branch V10.4.1-kernel-only https://github.com/FreeRTOS/FreeRTOS-Kernel.git --depth 1 ./sources/FreeRTOS \

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ cd /sources/ChibiOs-Contrib
1616
git pull origin chibios-21.11.x
1717
cd /sources/mbedtls
1818
git pull origin mbedtls-3.6.0
19+
git submodule update --init
1920
cd /sources/fatfs
2021
git pull origin R0.15
2122
cd /sources/FreeRTOS

.devcontainer/AzureRTOS/Dockerfile.AzureRTOS.SRC

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,11 @@ RUN git clone --branch v6.4.0_rel --recursive https://github.com/eclipse-threadx
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 mbedtls-3.6.0 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
71-
&& git clone --branch R0.15 https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \
72-
&& git clone --branch v2.9.3 https://github.com/littlefs-project/littlefs --depth 1 ./sources/littlefs
70+
RUN git clone --branch R0.15 https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \
71+
&& git clone --branch v2.9.3 https://github.com/littlefs-project/littlefs --depth 1 ./sources/littlefs \
72+
&& git clone --branch mbedtls-3.6.0 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
73+
&& cd ./sources/mbedtls \
74+
&& git submodule update --init --recursive
7375

7476
# set gcc location
7577
ARG TMP_GCC_PATH=/usr/local/bin/gcc

.devcontainer/ChibiOS/Dockerfile.ChibiOS.SRC

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,12 @@ 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 mbedtls-3.6.0 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
69-
&& git clone --branch R0.15 https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \
68+
RUN git clone --branch R0.15 https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \
7069
&& git clone --branch v2.9.3 https://github.com/littlefs-project/littlefs --depth 1 ./sources/littlefs \
71-
&& git clone --branch STABLE-2_1_3_RELEASE https://github.com/lwip-tcpip/lwip.git --depth 1 ./sources/lwip
70+
&& git clone --branch STABLE-2_1_3_RELEASE https://github.com/lwip-tcpip/lwip.git --depth 1 ./sources/lwip \
71+
&& git clone --branch mbedtls-3.6.0 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
72+
&& cd ./sources/mbedtls \
73+
&& git submodule update --init --recursive
7274

7375
# set gcc location
7476
ARG TMP_GCC_PATH=/usr/local/bin/gcc

.devcontainer/FreeRTOS-NXP/Dockerfile.FreeRTOS-NXP.SRC

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,11 @@ RUN apt-get update \
5555
RUN mkdir -p /usr/local/bin/gcc
5656

5757
# Clone libs mbedtls and fatfs etc.
58-
RUN git clone --branch mbedtls-3.6.0 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
59-
&& git clone --branch R0.15 https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \
60-
&& git clone --branch STABLE-2_1_3_RELEASE https://github.com/lwip-tcpip/lwip.git --depth 1 ./sources/lwip
58+
RUN git clone --branch R0.15 https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \
59+
&& git clone --branch STABLE-2_1_3_RELEASE https://github.com/lwip-tcpip/lwip.git --depth 1 ./sources/lwip \
60+
&& git clone --branch mbedtls-3.6.0 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
61+
&& cd ./sources/mbedtls \
62+
&& git submodule update --init --recursive
6163

6264
# Clone FreeRTOS
6365
RUN git clone --branch V10.4.1-kernel-only https://github.com/FreeRTOS/FreeRTOS-Kernel.git --depth 1 ./sources/FreeRTOS \

0 commit comments

Comments
 (0)