From 94eaeab513606959ed12b9013fece52e715d2518 Mon Sep 17 00:00:00 2001 From: weicheng Date: Fri, 12 May 2023 21:07:32 +0800 Subject: [PATCH] add asr docker image (#26531) Co-authored-by: weicheng --- .../docker/images/chip-build-asr/Dockerfile | 20 +++++++++++++++++++ .../docker/images/chip-build-asr/build.sh | 1 + .../docker/images/chip-build-asr/run.sh | 1 + .../docker/images/chip-build-asr/version | 1 + .../images/chip-build-vscode/Dockerfile | 4 ++++ integrations/docker/images/chip-build/version | 2 +- 6 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 integrations/docker/images/chip-build-asr/Dockerfile create mode 120000 integrations/docker/images/chip-build-asr/build.sh create mode 120000 integrations/docker/images/chip-build-asr/run.sh create mode 120000 integrations/docker/images/chip-build-asr/version diff --git a/integrations/docker/images/chip-build-asr/Dockerfile b/integrations/docker/images/chip-build-asr/Dockerfile new file mode 100644 index 00000000000000..c03a5533856241 --- /dev/null +++ b/integrations/docker/images/chip-build-asr/Dockerfile @@ -0,0 +1,20 @@ +ARG VERSION=latest +FROM connectedhomeip/chip-build:${VERSION} + +# Setup ASR +ARG ASR_DIR=/opt/asr +RUN set -x \ + && apt-get update \ + && apt-get install -y git git-lfs \ + && mkdir ${ASR_DIR} \ + && cd ${ASR_DIR} \ + && git clone --depth=1 https://github.com/asriot/Tools.git \ + && cd Tools \ + && git lfs pull \ + && cd toolchain \ + && tar -jxvf gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2 \ + && mkdir -p asr_riscv_gnu_toolchain_10.2_ubuntu-16.04 \ + && tar -jxvf asr_riscv_gnu_toolchain_10.2_ubuntu-16.04.tar.bz2 -C asr_riscv_gnu_toolchain_10.2_ubuntu-16.04/ \ + && : # last line + +ENV ASR_TOOLCHAIN_PATH=${ASR_DIR}/Tools/toolchain/gcc-arm-none-eabi-9-2019-q4-major/bin/ diff --git a/integrations/docker/images/chip-build-asr/build.sh b/integrations/docker/images/chip-build-asr/build.sh new file mode 120000 index 00000000000000..fcb4d4ee75d531 --- /dev/null +++ b/integrations/docker/images/chip-build-asr/build.sh @@ -0,0 +1 @@ +../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-asr/run.sh b/integrations/docker/images/chip-build-asr/run.sh new file mode 120000 index 00000000000000..ccbd3501b330d9 --- /dev/null +++ b/integrations/docker/images/chip-build-asr/run.sh @@ -0,0 +1 @@ +../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/chip-build-asr/version b/integrations/docker/images/chip-build-asr/version new file mode 120000 index 00000000000000..a4280acd348e7f --- /dev/null +++ b/integrations/docker/images/chip-build-asr/version @@ -0,0 +1 @@ +../chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/chip-build-vscode/Dockerfile b/integrations/docker/images/chip-build-vscode/Dockerfile index d0e45d41b41b75..6b33cc934f97fe 100644 --- a/integrations/docker/images/chip-build-vscode/Dockerfile +++ b/integrations/docker/images/chip-build-vscode/Dockerfile @@ -14,6 +14,7 @@ FROM connectedhomeip/chip-build-imx:${VERSION} AS imx FROM connectedhomeip/chip-build-ti:${VERSION} AS ti FROM connectedhomeip/chip-build-openiotsdk:${VERSION} AS openiotsdk FROM connectedhomeip/chip-build-bouffalolab:${VERSION} AS bouffalolab +FROM connectedhomeip/chip-build-asr:${VERSION} AS asr FROM connectedhomeip/chip-build:${VERSION} # qemu-src copied over because qemu directory contains symlinks to the src @@ -54,6 +55,8 @@ COPY --from=openiotsdk /opt/FVP_Corstone_SSE-300/ /opt/FVP_Corstone_SSE-300/ COPY --from=bouffalolab /opt/bouffalolab_sdk /opt/bouffalolab_sdk +COPY --from=asr /opt/asr /opt/asr + # Android license file "acceping" is done by writing license hashes # into the 'licenses' subfolder. This allows any user (in particular # 'vscode' to accept licenses) @@ -116,3 +119,4 @@ ENV TIZEN_SDK_SYSROOT $TIZEN_SDK_ROOT/platforms/tizen-$TIZEN_VERSION/mobile/root ENV FVP_CORSTONE_300_PATH=/opt/FVP_Corstone_SSE-300 ENV BOUFFALOLAB_SDK_ROOT=/opt/bouffalolab_sdk +ENV ASR_TOOLCHAIN_PATH=/opt/asr/Tools/toolchain/gcc-arm-none-eabi-9-2019-q4-major/bin/ diff --git a/integrations/docker/images/chip-build/version b/integrations/docker/images/chip-build/version index 4930e0379db757..cd9e441ba3286f 100644 --- a/integrations/docker/images/chip-build/version +++ b/integrations/docker/images/chip-build/version @@ -1 +1 @@ -0.7.5 Version bump reason: [OIS] Remove GCC toolchain +0.7.6 Version bump reason: [ASR] add ASR docker image