From 7f962d7a820561f4a8e7a40423c281e4518b69c2 Mon Sep 17 00:00:00 2001
From: Vincent Coubard <vincent.coubard@arm.com>
Date: Mon, 13 Feb 2023 16:21:02 +0000
Subject: [PATCH] [OIS] Remove download of GCC for Open IoT SDK build

The same version of the compiler is downloaded using cipd.

Signed-off-by: Vincent Coubard <vincent.coubard@arm.com>
---
 .vscode/launch.json                                  |  4 ++--
 .../docker/images/chip-build-openiotsdk/Dockerfile   | 12 +-----------
 .../docker/images/chip-build-vscode/Dockerfile       |  1 -
 integrations/docker/images/chip-build/version        |  2 +-
 4 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 5a8cfbce9c8682..e68b78cbd4e57a 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -432,7 +432,7 @@
             "request": "launch",
             "cwd": "${workspaceRoot}/examples/${input:openiotsdkApp}/openiotsdk",
             "executable": "./build/chip-openiotsdk-${input:openiotsdkApp}-example.elf",
-            "armToolchainPath": "${env:ARM_GCC_TOOLCHAIN_PATH}/bin",
+            "armToolchainPath": "${env:PW_ENVIRONMENT_ROOT}/cipd/packages/arm/bin/",
             "servertype": "external",
             "gdbTarget": "${input:openiotsdkRemoteHost}:31627", //GDBserver port on FVP
             "overrideLaunchCommands": [
@@ -452,7 +452,7 @@
             "request": "launch",
             "cwd": "${workspaceRoot}/src/test_driver/openiotsdk/unit-tests",
             "executable": "./build/${input:openiotsdkUnittest}.elf",
-            "armToolchainPath": "${env:ARM_GCC_TOOLCHAIN_PATH}/bin",
+            "armToolchainPath": "${env:PW_ENVIRONMENT_ROOT}/cipd/packages/arm/bin/",
             "servertype": "external",
             "gdbTarget": ":31627", //GDBserver port on FVP
             "overrideLaunchCommands": ["-enable-pretty-printing"],
diff --git a/integrations/docker/images/chip-build-openiotsdk/Dockerfile b/integrations/docker/images/chip-build-openiotsdk/Dockerfile
index d3daf90439b5d3..2759f7e34c20e2 100644
--- a/integrations/docker/images/chip-build-openiotsdk/Dockerfile
+++ b/integrations/docker/images/chip-build-openiotsdk/Dockerfile
@@ -11,14 +11,6 @@ RUN set -x \
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
-# ------------------------------------------------------------------------------
-# Download ARM GCC toolchain 10.3-2021.10
-RUN set -x \
-    && wget -q https://developer.arm.com/-/media/Files/downloads/gnu-rm/10.3-2021.10/gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2 \
-    && tar -xjf gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2 -C /opt \
-    && rm -r gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2 \
-    && : # last line
-
 # ------------------------------------------------------------------------------
 # Install FVP Corstone 300
 RUN set -x \
@@ -30,7 +22,6 @@ RUN set -x \
 
 FROM connectedhomeip/chip-build:${VERSION}
 
-COPY --from=build /opt/gcc-arm-none-eabi-10.3-2021.10/ /opt/gcc-arm-none-eabi-10.3-2021.10/
 COPY --from=build /opt/FVP_Corstone_SSE-300/ /opt/FVP_Corstone_SSE-300/
 
 # Required packages for building, running and testing
@@ -47,6 +38,5 @@ RUN set -x \
 # ------------------------------------------------------------------------------
 # Configure environment variables
 ENV FVP_CORSTONE_300_PATH=/opt/FVP_Corstone_SSE-300
-ENV ARM_GCC_TOOLCHAIN_PATH=/opt/gcc-arm-none-eabi-10.3-2021.10
 
-ENV PATH="${PATH}:${FVP_CORSTONE_300_PATH}/models/Linux64_GCC-6.4:${ARM_GCC_TOOLCHAIN_PATH}/bin"
+ENV PATH="${PATH}:${FVP_CORSTONE_300_PATH}/models/Linux64_GCC-6.4"
diff --git a/integrations/docker/images/chip-build-vscode/Dockerfile b/integrations/docker/images/chip-build-vscode/Dockerfile
index 7e4186dd7d3254..d0e45d41b41b75 100644
--- a/integrations/docker/images/chip-build-vscode/Dockerfile
+++ b/integrations/docker/images/chip-build-vscode/Dockerfile
@@ -115,5 +115,4 @@ ENV TIZEN_SDK_TOOLCHAIN $TIZEN_SDK_ROOT/tools/arm-linux-gnueabi-gcc-9.2
 ENV TIZEN_SDK_SYSROOT $TIZEN_SDK_ROOT/platforms/tizen-$TIZEN_VERSION/mobile/rootstraps/mobile-$TIZEN_VERSION-device.core
 
 ENV FVP_CORSTONE_300_PATH=/opt/FVP_Corstone_SSE-300
-ENV ARM_GCC_TOOLCHAIN_PATH=/opt/gcc-arm-none-eabi-10.3-2021.10
 ENV BOUFFALOLAB_SDK_ROOT=/opt/bouffalolab_sdk
diff --git a/integrations/docker/images/chip-build/version b/integrations/docker/images/chip-build/version
index 4be9a0fdb75892..4930e0379db757 100644
--- a/integrations/docker/images/chip-build/version
+++ b/integrations/docker/images/chip-build/version
@@ -1 +1 @@
-0.7.4 Version bump reason: [K32W0] SDK 2.6.11 update
+0.7.5 Version bump reason: [OIS] Remove GCC toolchain