Improve Dockerfile for AzureRTOS (#2767)

nanoframework · Sep 27, 2023 · 6c4f0da · 6c4f0da
1 parent 248d9d6
commit 6c4f0da
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/.devcontainer/sources/Dockerfile.All b/.devcontainer/sources/Dockerfile.All
@@ -69,8 +69,8 @@ RUN git clone --branch nf-build https://github.com/nanoframework/STM32CubeL4.git
     && git clone --branch nf-build https://github.com/nanoframework/STM32CubeF7.git --depth 1 ./sources/STM32CubeF7 \
     && git clone --branch nf-build https://github.com/nanoframework/STM32CubeF4.git --depth 1 ./sources/STM32CubeF4 \
     && git clone --branch nf-build https://github.com/nanoframework/STM32CubeH7.git --depth 1 ./sources/STM32CubeH7 \
-    && git clone --branch v6.1.12_rel --recursive https://github.com/azure-rtos/threadx.git --depth 1 ./sources/AzureRTOS \
-    && git clone --branch v6.1.12_rel --recursive https://github.com/azure-rtos/netxduo.git --depth 1 ./sources/NextDuo \
+    && git clone --branch v6.2.0_rel --recursive https://github.com/azure-rtos/threadx.git --depth 1 ./sources/AzureRTOS \
+    && git clone --branch v6.2.0_rel --recursive https://github.com/azure-rtos/netxduo.git --depth 1 ./sources/NetxDuo \
     && git svn clone http://svn.code.sf.net/p/chibios/code/branches/stable_21.11.x -rHEAD ./sources/ChibiOs \
     && git clone --branch nanoframework https://github.com/nanoframework/ChibiOS-Contrib.git --depth 1 ./sources/ChibiOs-Contrib
 # Clone mbedtls and fatfs

diff --git a/.devcontainer/sources/Dockerfile.AzureRTOS b/.devcontainer/sources/Dockerfile.AzureRTOS
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxcontainers/debian-slim:latest AS downloader
+FROM ubuntu:latest AS downloader
 RUN apt-get update \
     && apt-get -y install --no-install-recommends apt-utils \
     && apt-get install -y \
@@ -22,7 +22,7 @@ RUN wget $CMAKE_SCRIPT \
       && /tmp/cmake-install.sh --skip-license --prefix=/tmp/dc-extracted/cmake \
       && rm /tmp/cmake-install.sh
 
-FROM ghcr.io/linuxcontainers/debian-slim:latest AS devcontainer
+FROM ubuntu:latest AS devcontainer
 
 # Avoid warnings by switching to noninteractive
 ENV DEBIAN_FRONTEND=noninteractive
@@ -45,17 +45,17 @@ RUN apt-get update \
     srecord
 
 # Create needed directories
-RUN mkdir -p /usr/local/bin/gcc \
-    && mkdir -p /usr/local/bin/xtensa
+RUN mkdir -p /usr/local/bin/gcc
 
 # Clone repos for STM32 including AzureRTOS
-RUN git clone --branch nf-build https://github.com/nanoframework/STM32CubeL4.git --depth 1 ./sources/STM32CubeL4 \
+RUN git svn clone http://svn.code.sf.net/p/chibios/code/branches/stable_21.11.x -rHEAD ./sources/ChibiOs \
+    && git clone --branch nf-build https://github.com/nanoframework/STM32CubeL4.git --depth 1 ./sources/STM32CubeL4 \
     && git clone --branch nf-build https://github.com/nanoframework/STM32CubeF7.git --depth 1 ./sources/STM32CubeF7 \
     && git clone --branch nf-build https://github.com/nanoframework/STM32CubeF4.git --depth 1 ./sources/STM32CubeF4 \
     && git clone --branch nf-build https://github.com/nanoframework/STM32CubeH7.git --depth 1 ./sources/STM32CubeH7 \
-    && git svn clone http://svn.code.sf.net/p/chibios/code/branches/stable_21.11.x -rHEAD ./sources/ChibiOs \
     && git clone --branch v6.2.0_rel --recursive https://github.com/azure-rtos/threadx.git --depth 1 ./sources/AzureRTOS \
-    && git clone --branch v6.2.0_rel --recursive https://github.com/azure-rtos/netxduo.git --depth 1 ./sources/NextDuo
+    && git clone --branch v6.2.0_rel --recursive https://github.com/azure-rtos/netxduo.git --depth 1 ./sources/NetxDuo
+
 # Clone mbedtls and fatfs
 RUN git clone --branch mbedtls-2.28.2 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
     && git clone --branch R0.14b https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \

diff --git a/CMake/Modules/FindnanoFramework.Hardware.GiantGecko.cmake b/CMake/Modules/FindnanoFramework.Hardware.GiantGecko.cmake
@@ -17,7 +17,7 @@ set(nanoFramework.Hardware.GiantGecko_SRCS
 
     nf_hardware_giantgecko_nanoFramework_Hardware_GiantGecko_GpioConfiguration.cpp
     nf_hardware_giantgecko_nanoFramework_Hardware_GiantGecko_Power.cpp
-    nf_hardware_giantgecko_nanoFramework_Hardware_GiantGecko_Rtc.cpp
+    nf_hardware_giantgecko_nanoFramework_Hardware_GiantGecko_RTC.cpp
     nf_hardware_giantgecko_nanoFramework_Hardware_GiantGecko_Utilities.cpp
 
 )

diff --git a/config/user-tools-repos.TEMPLATE.json b/config/user-tools-repos.TEMPLATE.json
@@ -44,7 +44,7 @@
                 "TI_XDCTOOLS_SOURCE": "/usr/local/bin/titools",
                 "TI_SYSCONFIG_SOURCE": "/sources/TI_SysConfig",
                 "AZURERTOS_SOURCE_FOLDER": "/sources/AzureRTOS",
-                "NETXDUO_SOURCE_FOLDER": "/sources/NextDuo"
+                "NETXDUO_SOURCE_FOLDER": "/sources/NetxDuo"
             }
         },
         {

diff --git a/...native_System_Device_WiFi_WiFiAdapter.cpp → ...native_System_Device_Wifi_WifiAdapter.cpp b/...native_System_Device_WiFi_WiFiAdapter.cpp → ...native_System_Device_Wifi_WifiAdapter.cpp