From 241fdb8f47811a5987773e7ae665f8bd4a99040d Mon Sep 17 00:00:00 2001 From: josesimoes Date: Mon, 8 Jan 2024 17:03:33 +0000 Subject: [PATCH] Bump Azure RTOS to 6.4.0 --- .devcontainer/sources/Dockerfile.All | 2 +- .devcontainer/sources/Dockerfile.AzureRTOS | 4 ++-- targets/AzureRTOS/CMakeLists.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.devcontainer/sources/Dockerfile.All b/.devcontainer/sources/Dockerfile.All index e0f11dc5b5..b6349fb2a4 100644 --- a/.devcontainer/sources/Dockerfile.All +++ b/.devcontainer/sources/Dockerfile.All @@ -74,7 +74,7 @@ RUN git clone --branch nf-build https://github.com/nanoframework/STM32CubeL4.git && git clone --branch chibios-21.11.x https://github.com/ChibiOS/ChibiOS-Contrib.git --depth 1 ./sources/ChibiOs-Contrib # Clone repos for AzureRTOS -RUN git clone --branch v6.3.0_rel --recursive https://github.com/azure-rtos/threadx.git --depth 1 ./sources/AzureRTOS \ +RUN git clone --branch v6.4.0_rel --recursive https://github.com/azure-rtos/threadx.git --depth 1 ./sources/AzureRTOS \ && git clone --branch v6.3.0_rel --recursive https://github.com/azure-rtos/netxduo.git --depth 1 ./sources/NetxDuo # Clone dependent repos (mbedtls, fatfs and spiffs) diff --git a/.devcontainer/sources/Dockerfile.AzureRTOS b/.devcontainer/sources/Dockerfile.AzureRTOS index a8c556b336..e302fba7c9 100644 --- a/.devcontainer/sources/Dockerfile.AzureRTOS +++ b/.devcontainer/sources/Dockerfile.AzureRTOS @@ -63,8 +63,8 @@ RUN git clone --branch nf-build https://github.com/nanoframework/STM32CubeL4.git && git clone --branch nf-build https://github.com/nanoframework/STM32CubeH7.git --depth 1 ./sources/STM32CubeH7 # Clone repos for AzureRTOS -RUN git clone --branch v6.3.0_rel --recursive https://github.com/azure-rtos/threadx.git --depth 1 ./sources/AzureRTOS \ - && git clone --branch v6.3.0_rel --recursive https://github.com/azure-rtos/netxduo.git --depth 1 ./sources/NetxDuo +RUN git clone --branch v6.4.0_rel --recursive https://github.com/azure-rtos/threadx.git --depth 1 ./sources/AzureRTOS \ + && git clone --branch v6.4.0_rel --recursive https://github.com/azure-rtos/netxduo.git --depth 1 ./sources/NetxDuo # Clone dependent repos (mbedtls, fatfs and spiffs) RUN git clone --branch mbedtls-2.28.5 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \ diff --git a/targets/AzureRTOS/CMakeLists.txt b/targets/AzureRTOS/CMakeLists.txt index 8fc691568d..b3e595d392 100644 --- a/targets/AzureRTOS/CMakeLists.txt +++ b/targets/AzureRTOS/CMakeLists.txt @@ -77,7 +77,7 @@ endif() if(RTOS_VERSION_EMPTY) # no AzureRTOS version actualy specified, must be empty which is fine, we'll default to a known good version # WHEN CHANGING THIS MAKE SURE TO UPDATE THE DEV CONTAINERS - set(RTOS_VERSION "v6.3.0_rel") + set(RTOS_VERSION "v6.4.0_rel") endif() if(NO_AZURERTOS_SOURCE_FOLDER)