Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Telink] Update Docker image (Zephyr SDK update) #37357

Merged
merged 5 commits into from
Feb 10, 2025
Merged

[Telink] Update Docker image (Zephyr SDK update) #37357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a6799db
[Telink] Manual Zephyr SDK update to check CI jobs
s07641069 Feb 3, 2025
e8eb070
Merge branch 'master' into telink_zephyr_sdk_update
s07641069 Feb 3, 2025
16abce3
Merge branch 'master' into telink_zephyr_sdk_update
s07641069 Feb 10, 2025
04f678d
[Telink] Update Zephyr revision & remove dev changes
s07641069 Feb 10, 2025
2fa22a1
typo
s07641069 Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion integrations/docker/images/base/chip-build/version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
111 : [Android] Update android sdk and java version
112 : [Telink] Update Docker image (Zephyr SDK update)
14 changes: 7 additions & 7 deletions integrations/docker/images/stage-2/chip-build-telink/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ RUN set -x \
# Setup toolchain
WORKDIR /opt/telink
RUN set -x \
&& curl --location https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.1/zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz --output zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz \
&& tar xvf zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz \
&& rm -rf zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz \
&& zephyr-sdk-0.16.1/setup.sh -t riscv64-zephyr-elf \
&& curl --location https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.17.0/zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz --output zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz \
&& tar xvf zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz \
&& rm -rf zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz \
&& zephyr-sdk-0.17.0/setup.sh -t riscv64-zephyr-elf \
&& : # last line

# Setup Zephyr
ARG ZEPHYR_REVISION=52c23bb5bfa7b08fb2499fda8c34cbd3418e0c1d
ARG ZEPHYR_REVISION=ce4027fc0768b8509758af2e43f74e3fd2c7d58d
WORKDIR /opt/telink/zephyrproject
RUN set -x \
&& python3 -m pip install --break-system-packages -U --no-cache-dir west \
Expand All @@ -34,7 +34,7 @@ RUN set -x \

FROM ghcr.io/project-chip/chip-build:${VERSION}

COPY --from=build /opt/telink/zephyr-sdk-0.16.1/ /opt/telink/zephyr-sdk-0.16.1/
COPY --from=build /opt/telink/zephyr-sdk-0.17.0/ /opt/telink/zephyr-sdk-0.17.0/
COPY --from=build /opt/telink/zephyrproject/ /opt/telink/zephyrproject/

RUN set -x \
Expand All @@ -45,4 +45,4 @@ RUN set -x \
&& : # last line

ENV TELINK_ZEPHYR_BASE=/opt/telink/zephyrproject/zephyr
ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.16.1
ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.17.0
4 changes: 2 additions & 2 deletions integrations/docker/images/vscode/chip-build-vscode/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ COPY --from=android /usr/lib/kotlinc /usr/lib/kotlinc
COPY --from=psoc6 /opt/Tools/ModusToolbox /opt/Tools/ModusToolbox

COPY --from=telink /opt/telink/zephyrproject /opt/telink/zephyrproject
COPY --from=telink /opt/telink/zephyr-sdk-0.16.1 /opt/telink/zephyr-sdk-0.16.1
COPY --from=telink /opt/telink/zephyr-sdk-0.17.0 /opt/telink/zephyr-sdk-0.17.0

COPY --from=tizen /opt/tizen-sdk /opt/tizen-sdk

Expand Down Expand Up @@ -126,7 +126,7 @@ ENV QEMU_ESP32=/opt/espressif/qemu/qemu-system-xtensa
ENV QEMU_ESP32_DIR=/opt/espressif/qemu
ENV SYSROOT_AARCH64=/opt/ubuntu-24.04-aarch64-sysroot
ENV TELINK_ZEPHYR_BASE=/opt/telink/zephyrproject/zephyr
ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.16.1
ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.17.0
ENV TI_SYSCONFIG_ROOT=/opt/ti/sysconfig_1.18.1
ENV ZEPHYR_BASE=/opt/NordicSemiconductor/nrfconnect/zephyr
ENV ZEPHYR_SDK_INSTALL_DIR=/opt/NordicSemiconductor/nRF5_tools/zephyr-sdk-0.17.0
Expand Down
Loading