Skip to content

Commit

Permalink
[OIS] Remove download of GCC for Open IoT SDK build (#26503)
Browse files Browse the repository at this point in the history
The same version of the compiler is downloaded using cipd.

Signed-off-by: Vincent Coubard <vincent.coubard@arm.com>
Co-authored-by: Vincent Coubard <vincent.coubard@arm.com>
  • Loading branch information
2 people authored and pull[bot] committed Jun 24, 2023
1 parent a32f22b commit 1132952
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand All @@ -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"],
Expand Down
12 changes: 1 addition & 11 deletions integrations/docker/images/chip-build-openiotsdk/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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
Expand All @@ -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"
1 change: 0 additions & 1 deletion integrations/docker/images/chip-build-vscode/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion integrations/docker/images/chip-build/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.7.4 Version bump reason: [K32W0] SDK 2.6.11 update
0.7.5 Version bump reason: [OIS] Remove GCC toolchain

0 comments on commit 1132952

Please sign in to comment.