Skip to content

Commit 906180f

Browse files
CopilotCopilot
authored
Migrate ST repositories in dev containers to official STMicroelectronics repos (#3294)
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: José Simões <jose.simoes@eclo.solutions> ***NO_CI***
1 parent b0a98a8 commit 906180f

File tree

9 files changed

+105
-44
lines changed

9 files changed

+105
-44
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.64
1+
FROM ghcr.io/nanoframework/dev-container-all:v2.65

‎.devcontainer/All/Dockerfile.All.SRC‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,24 @@ RUN mkdir -p /usr/local/bin/gcc \
9090
# Alternative source for those having issues with git svn downloads:
9191
RUN git clone --branch stable_21.11.x https://github.com/ArduPilot/ChibiOS.svn.git --depth 1 ./sources/ChibiOs
9292

93-
# Clone support repos for STM32 including Eclipse ThreadX (used to be Azure RTOS)
94-
RUN git clone --branch nf-build https://github.com/nanoframework/STM32CubeL4.git --depth 1 ./sources/STM32CubeL4 \
95-
&& git clone --branch nf-build https://github.com/nanoframework/STM32CubeF7.git --depth 1 ./sources/STM32CubeF7 \
96-
&& git clone --branch nf-build https://github.com/nanoframework/STM32CubeF4.git --depth 1 ./sources/STM32CubeF4 \
97-
&& git clone --branch nf-build https://github.com/nanoframework/STM32CubeH7.git --depth 1 ./sources/STM32CubeH7 \
98-
&& git clone --branch chibios-21.11.x https://github.com/ChibiOS/ChibiOS-Contrib.git --depth 1 ./sources/ChibiOs-Contrib
93+
# Clone support repos for STM32 - HAL drivers (official ST repositories)
94+
# WHEN CHANGING THESE MAKE SURE TO UPDATE git-pull-repos.sh
95+
RUN git clone --branch v1.7.8 https://github.com/STMicroelectronics/stm32f0xx_hal_driver.git --depth 1 ./sources/stm32f0xx_hal_driver \
96+
&& git clone --branch v1.8.2 https://github.com/STMicroelectronics/stm32f4xx_hal_driver.git --depth 1 ./sources/stm32f4xx_hal_driver \
97+
&& git clone --branch v1.3.1 https://github.com/STMicroelectronics/stm32f7xx_hal_driver.git --depth 1 ./sources/stm32f7xx_hal_driver \
98+
&& git clone --branch v1.11.3 https://github.com/STMicroelectronics/stm32h7xx_hal_driver.git --depth 1 ./sources/stm32h7xx_hal_driver \
99+
&& git clone --branch v1.13.4 https://github.com/STMicroelectronics/stm32l4xx_hal_driver.git --depth 1 ./sources/stm32l4xx_hal_driver
100+
101+
# Clone support repos for STM32 - CMSIS device packages (official ST repositories)
102+
# WHEN CHANGING THESE MAKE SURE TO UPDATE git-pull-repos.sh
103+
RUN git clone --branch v2.3.7 https://github.com/STMicroelectronics/cmsis_device_f0.git --depth 1 ./sources/cmsis_device_f0 \
104+
&& git clone --branch v2.6.9 https://github.com/STMicroelectronics/cmsis_device_f4.git --depth 1 ./sources/cmsis_device_f4 \
105+
&& git clone --branch v1.2.9 https://github.com/STMicroelectronics/cmsis_device_f7.git --depth 1 ./sources/cmsis_device_f7 \
106+
&& git clone --branch v1.10.4 https://github.com/STMicroelectronics/cmsis_device_h7.git --depth 1 ./sources/cmsis_device_h7 \
107+
&& git clone --branch v1.7.3 https://github.com/STMicroelectronics/cmsis_device_l4.git --depth 1 ./sources/cmsis_device_l4 \
108+
&& git clone --branch v5.6.0 https://github.com/STMicroelectronics/cmsis_core.git --depth 1 ./sources/cmsis_core
109+
110+
RUN git clone --branch chibios-21.11.x https://github.com/ChibiOS/ChibiOS-Contrib.git --depth 1 ./sources/ChibiOs-Contrib
99111

100112
# Clone repos for Eclipse ThreadX (used to be Azure RTOS)
101113
RUN git clone --branch v6.5.0.202601_rel --recursive https://github.com/eclipse-threadx/threadx.git --depth 1 ./sources/ThreadX \

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

Lines changed: 47 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,66 @@
1+
#!/usr/bin/env bash
2+
set -euo pipefail
3+
14
echo "Pulling all the repos"
2-
cd /sources/STM32CubeL4
3-
git pull origin nf-build
4-
cd /sources/STM32CubeF7
5-
git pull origin nf-build
6-
cd /sources/STM32CubeF4
7-
git pull origin nf-build
8-
cd /sources/STM32CubeH7
9-
git pull origin nf-build
10-
cd /sources/ThreadX
5+
cd /sources/stm32f0xx_hal_driver || exit 1
6+
git fetch --depth=1 origin tag v1.7.8
7+
git checkout tags/v1.7.8
8+
cd /sources/stm32f4xx_hal_driver || exit 1
9+
git fetch --depth=1 origin tag v1.8.2
10+
git checkout tags/v1.8.2
11+
cd /sources/stm32f7xx_hal_driver || exit 1
12+
git fetch --depth=1 origin tag v1.3.1
13+
git checkout tags/v1.3.1
14+
cd /sources/stm32h7xx_hal_driver || exit 1
15+
git fetch --depth=1 origin tag v1.11.3
16+
git checkout tags/v1.11.3
17+
cd /sources/stm32l4xx_hal_driver || exit 1
18+
git fetch --depth=1 origin tag v1.13.4
19+
git checkout tags/v1.13.4
20+
cd /sources/cmsis_device_f0 || exit 1
21+
git fetch --depth=1 origin tag v2.3.7
22+
git checkout tags/v2.3.7
23+
cd /sources/cmsis_device_f4 || exit 1
24+
git fetch --depth=1 origin tag v2.6.9
25+
git checkout tags/v2.6.9
26+
cd /sources/cmsis_device_f7 || exit 1
27+
git fetch --depth=1 origin tag v1.2.9
28+
git checkout tags/v1.2.9
29+
cd /sources/cmsis_device_h7 || exit 1
30+
git fetch --depth=1 origin tag v1.10.4
31+
git checkout tags/v1.10.4
32+
cd /sources/cmsis_device_l4 || exit 1
33+
git fetch --depth=1 origin tag v1.7.3
34+
git checkout tags/v1.7.3
35+
cd /sources/cmsis_core || exit 1
36+
git fetch --depth=1 origin tag v5.6.0
37+
git checkout tags/v5.6.0
38+
cd /sources/ThreadX || exit 1
1139
git pull
1240
cd /
1341
rm -rf /sources/ChibiOs
1442
git svn clone http://svn.code.sf.net/p/chibios/code/branches/stable_21.11.x -rHEAD /sources/ChibiOs
15-
cd /sources/ChibiOs-Contrib
43+
cd /sources/ChibiOs-Contrib || exit 1
1644
git pull origin chibios-21.11.x
17-
cd /sources/mbedtls
45+
cd /sources/mbedtls || exit 1
1846
git fetch --depth=1 origin tag mbedtls-3.6.5
1947
git checkout tags/mbedtls-3.6.5
2048
git submodule update --init
21-
cd /sources/fatfs
49+
cd /sources/fatfs || exit 1
2250
git fetch --depth=1 origin tag R0.16
2351
git checkout tags/R0.16
24-
cd /sources/FreeRTOS
52+
cd /sources/FreeRTOS || exit 1
2553
git pull origin V10.4.1-kernel-only
26-
cd /sources/CMSIS_5
54+
cd /sources/CMSIS_5 || exit 1
2755
git pull origin 5.5.1
28-
cd /sources/lwip
56+
cd /sources/lwip || exit 1
2957
git pull origin STABLE-2_1_3_RELEASE
30-
cd /sources/littlefs
58+
cd /sources/littlefs || exit 1
3159
git pull origin v2.11.2
32-
cd /sources/SimpleLinkCC32
60+
cd /sources/SimpleLinkCC32 || exit 1
3361
git pull origin 4.10.00.07
34-
cd /sources/SimpleLinkCC13
62+
cd /sources/SimpleLinkCC13 || exit 1
3563
git pull origin 4.20.01.04
36-
cd /sources/TI_SysConfig
64+
cd /sources/TI_SysConfig || exit 1
3765
git pull origin 1.5.0
3866
echo "All repos pulled and up to date"

‎.devcontainer/ChibiOS/Dockerfile.ChibiOS‎

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.39
1+
FROM ghcr.io/nanoframework/dev-container-chibios:v1.40

‎.devcontainer/ChibiOS/Dockerfile.ChibiOS.SRC‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,22 @@ RUN mkdir -p /usr/local/bin/gcc
5757
# Alternative source for those having issues with git svn downloads:
5858
RUN git clone --branch stable_21.11.x https://github.com/ArduPilot/ChibiOS.svn.git --depth 1 ./sources/ChibiOs
5959

60-
# Clone support repos for STM32
61-
RUN git clone --branch nf-build https://github.com/nanoframework/STM32CubeL4.git --depth 1 ./sources/STM32CubeL4 \
62-
&& git clone --branch nf-build https://github.com/nanoframework/STM32CubeF7.git --depth 1 ./sources/STM32CubeF7 \
63-
&& git clone --branch nf-build https://github.com/nanoframework/STM32CubeF4.git --depth 1 ./sources/STM32CubeF4 \
64-
&& git clone --branch nf-build https://github.com/nanoframework/STM32CubeH7.git --depth 1 ./sources/STM32CubeH7 \
65-
&& git clone --branch chibios-21.11.x https://github.com/ChibiOS/ChibiOS-Contrib.git --depth 1 ./sources/ChibiOs-Contrib
60+
# Clone support repos for STM32 - HAL drivers (official ST repositories)
61+
RUN git clone --branch v1.7.8 https://github.com/STMicroelectronics/stm32f0xx_hal_driver.git --depth 1 ./sources/stm32f0xx_hal_driver \
62+
&& git clone --branch v1.8.2 https://github.com/STMicroelectronics/stm32f4xx_hal_driver.git --depth 1 ./sources/stm32f4xx_hal_driver \
63+
&& git clone --branch v1.3.1 https://github.com/STMicroelectronics/stm32f7xx_hal_driver.git --depth 1 ./sources/stm32f7xx_hal_driver \
64+
&& git clone --branch v1.11.3 https://github.com/STMicroelectronics/stm32h7xx_hal_driver.git --depth 1 ./sources/stm32h7xx_hal_driver \
65+
&& git clone --branch v1.13.4 https://github.com/STMicroelectronics/stm32l4xx_hal_driver.git --depth 1 ./sources/stm32l4xx_hal_driver
66+
67+
# Clone support repos for STM32 - CMSIS device packages (official ST repositories)
68+
RUN git clone --branch v2.3.7 https://github.com/STMicroelectronics/cmsis_device_f0.git --depth 1 ./sources/cmsis_device_f0 \
69+
&& git clone --branch v2.6.9 https://github.com/STMicroelectronics/cmsis_device_f4.git --depth 1 ./sources/cmsis_device_f4 \
70+
&& git clone --branch v1.2.9 https://github.com/STMicroelectronics/cmsis_device_f7.git --depth 1 ./sources/cmsis_device_f7 \
71+
&& git clone --branch v1.10.4 https://github.com/STMicroelectronics/cmsis_device_h7.git --depth 1 ./sources/cmsis_device_h7 \
72+
&& git clone --branch v1.7.3 https://github.com/STMicroelectronics/cmsis_device_l4.git --depth 1 ./sources/cmsis_device_l4 \
73+
&& git clone --branch v5.6.0 https://github.com/STMicroelectronics/cmsis_core.git --depth 1 ./sources/cmsis_core
74+
75+
RUN git clone --branch chibios-21.11.x https://github.com/ChibiOS/ChibiOS-Contrib.git --depth 1 ./sources/ChibiOs-Contrib
6676

6777
# Clone dependent repos (mbedtls, fatfs and littlefs etc.)
6878
RUN git clone --branch R0.16 https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \

‎.devcontainer/ThreadX/Dockerfile.ThreadX‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM ghcr.io/nanoframework/dev-container-threadx:v1.39
1+
FROM ghcr.io/nanoframework/dev-container-threadx:v1.40

‎.devcontainer/ThreadX/Dockerfile.ThreadX.SRC‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,18 @@ RUN mkdir -p /usr/local/bin/gcc
5656
# Alternative source for those having issues with git svn downloads:
5757
RUN git clone --branch stable_21.11.x https://github.com/ArduPilot/ChibiOS.svn.git --depth 1 ./sources/ChibiOs
5858

59-
# Clone repos for STM32
60-
RUN git clone --branch nf-build https://github.com/nanoframework/STM32CubeL4.git --depth 1 ./sources/STM32CubeL4 \
61-
&& git clone --branch nf-build https://github.com/nanoframework/STM32CubeF7.git --depth 1 ./sources/STM32CubeF7 \
62-
&& git clone --branch nf-build https://github.com/nanoframework/STM32CubeF4.git --depth 1 ./sources/STM32CubeF4 \
63-
&& git clone --branch nf-build https://github.com/nanoframework/STM32CubeH7.git --depth 1 ./sources/STM32CubeH7
59+
# Clone support repos for STM32 - HAL drivers (official ST repositories)
60+
RUN git clone --branch v1.8.2 https://github.com/STMicroelectronics/stm32f4xx_hal_driver.git --depth 1 ./sources/stm32f4xx_hal_driver \
61+
&& git clone --branch v1.3.1 https://github.com/STMicroelectronics/stm32f7xx_hal_driver.git --depth 1 ./sources/stm32f7xx_hal_driver \
62+
&& git clone --branch v1.11.3 https://github.com/STMicroelectronics/stm32h7xx_hal_driver.git --depth 1 ./sources/stm32h7xx_hal_driver \
63+
&& git clone --branch v1.13.4 https://github.com/STMicroelectronics/stm32l4xx_hal_driver.git --depth 1 ./sources/stm32l4xx_hal_driver
64+
65+
# Clone support repos for STM32 - CMSIS device packages (official ST repositories)
66+
RUN git clone --branch v2.6.9 https://github.com/STMicroelectronics/cmsis_device_f4.git --depth 1 ./sources/cmsis_device_f4 \
67+
&& git clone --branch v1.2.9 https://github.com/STMicroelectronics/cmsis_device_f7.git --depth 1 ./sources/cmsis_device_f7 \
68+
&& git clone --branch v1.10.4 https://github.com/STMicroelectronics/cmsis_device_h7.git --depth 1 ./sources/cmsis_device_h7 \
69+
&& git clone --branch v1.7.3 https://github.com/STMicroelectronics/cmsis_device_l4.git --depth 1 ./sources/cmsis_device_l4 \
70+
&& git clone --branch v5.6.0 https://github.com/STMicroelectronics/cmsis_core.git --depth 1 ./sources/cmsis_core
6471

6572
# Clone repos for Eclipse ThreadX (used to be Azure RTOS)
6673
RUN git clone --branch v6.5.0.202601_rel --recursive https://github.com/eclipse-threadx/threadx.git --depth 1 ./sources/ThreadX \

‎CMake/Modules/STM32_CubePackage.cmake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ macro(ProcessSTM32CubePackage)
5555
endif()
5656

5757
if(NO_STM32_HAL_DRIVER_SOURCE)
58-
# no STM HAL driver source specified, download it from nanoFramework fork
58+
# no STM HAL driver source specified, download it from official ST repo
5959
message(STATUS "STM32${TARGET_SERIES_SHORT} HAL driver from GitHub repo")
6060

6161
FetchContent_Declare(
@@ -90,7 +90,7 @@ macro(ProcessSTM32CubePackage)
9090
endif()
9191

9292
if(NO_STM32_CMSIS_DEVICE_SOURCE)
93-
# no STM Device CMSIS source specified, download it from nanoFramework fork
93+
# no STM Device CMSIS source specified, download it from official ST repo
9494
message(STATUS "STM32${TARGET_SERIES_SHORT} Device CMSIS from GitHub repo")
9595

9696
FetchContent_Declare(
@@ -125,7 +125,7 @@ macro(ProcessSTM32CubePackage)
125125
endif()
126126

127127
if(NO_STM32_CMSIS_CORE_SOURCE)
128-
# no STM CMSIS Core source specified, download it from nanoFramework fork
128+
# no STM CMSIS Core source specified, download it from official ST repo
129129
message(STATUS "STM32${TARGET_SERIES_SHORT} CMSIS Core from GitHub repo")
130130

131131
FetchContent_Declare(

‎config/user-tools-repos.TEMPLATE.json‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
"FREERTOS_SOURCE_FOLDER": "<path-to-FreeRTOS-source-folder-if-supported-mind-the-forward-slash>",
1313
"CHIBIOS_CONTRIB_SOURCE": "<path-to-local-ChibiOS-contrib-source-mind-the-forward-slash>",
1414
"CHIBIOS_HAL_SOURCE": "<path-to-ChibiOS-source-folder-if-supported-mind-the-forward-slash>",
15-
"STM32_CUBE_PACKAGE_SOURCE": "<path-to-stm32-cubemx-package-mind-the-forward-slash>",
15+
"STM32_HAL_DRIVER_SOURCE": "<path-to-stm32-hal-driver-for-target-series-mind-the-forward-slash>",
16+
"STM32_CMSIS_DEVICE_SOURCE": "<path-to-stm32-cmsis-device-for-target-series-mind-the-forward-slash>",
17+
"STM32_CMSIS_CORE_SOURCE": "<path-to-stm32-cmsis-core-mind-the-forward-slash>",
1618
"LWIP_SOURCE": "<path-to-lwip-source-mind-the-forward-slashes>",
1719
"MBEDTLS_SOURCE": "<path-to-mbedtls-source-mind-the-forward-slashes>",
1820
"FATFS_SOURCE": "<path-to-local-FATFS-source-mind-the-forward-slash>",
@@ -37,7 +39,9 @@
3739
"FREERTOS_SOURCE_FOLDER": "/sources/FreeRTOS",
3840
"CHIBIOS_CONTRIB_SOURCE": "/sources/ChibiOs-Contrib",
3941
"CHIBIOS_HAL_SOURCE": "/sources/ChibiOs",
40-
"STM32_CUBE_PACKAGE_SOURCE": "/sources/STM32CubeF7",
42+
"STM32_HAL_DRIVER_SOURCE": "/sources/stm32f7xx_hal_driver",
43+
"STM32_CMSIS_DEVICE_SOURCE": "/sources/cmsis_device_f7",
44+
"STM32_CMSIS_CORE_SOURCE": "/sources/cmsis_core",
4145
"LWIP_SOURCE": "/sources/lwip",
4246
"MBEDTLS_SOURCE": "/sources/mbedtls",
4347
"FATFS_SOURCE": "/sources/fatfs",

0 commit comments

Comments
 (0)