Skip to content

Commit 231b8b0

Browse files
s07641069gmarcosb
authored andcommitted
[Telink] Update Docker image (Zephyr 3.3 & 3.7 support) (project-chip#37852)
* [Telink] Update Docker image (Zephyr 3.3 & 3.7 support) * [Telink] Remove Telink Zephyr 3.3 from chip-build-vscode
1 parent 113ff1c commit 231b8b0

File tree

9 files changed

+60
-7
lines changed

9 files changed

+60
-7
lines changed

.github/workflows/docker_img.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ jobs:
105105
- "-nxp-zephyr"
106106
- "-nrf-platform"
107107
- "-telink"
108+
- "-telink-zephyr_3_3"
108109
- "-ti"
109110
- "-tizen"
110111
- "-openiotsdk"

CODEOWNERS

+1
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,6 @@ stm32/ @STYoannZamaron
6767

6868
telink/ @s07641069
6969
chip-build-telink/ @s07641069
70+
chip-build-telink-zephyr_3_3/ @s07641069
7071

7172
webos/ @joonhaengHeo

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ be useful for quick filtering like `[TC-ABC-1.2]` to tag test changes.
175175
Examples of descriptive titles:
176176

177177
- `[Silabs] Fix compile of SiWx917 if LED and BUTTON are disabled`
178-
- `[Telink] Update build Dockerfile with new Zeprhy SHA: c05c4.....`
178+
- `[Telink] Update build Dockerfile with new Zephyr SHA: c05c4.....`
179179
- `General Commissioning Cluster: use AttributeAccessInterface/CommandHandlerInterface for processing`
180180
- `Scenes Management/CopyScene: set access as manage instead of default to match the spec`
181181
- `Fix build errors due to ChipDeviceEvent default constructor not being available`
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
120 : [NXP] Update NXP sdk version
1+
121 : [Telink] Update Docker image (Zephyr 3.3 & 3.7 support)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
ARG VERSION=1
2+
FROM ghcr.io/project-chip/chip-build:${VERSION} as build
3+
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip
4+
5+
RUN set -x \
6+
&& apt-get update \
7+
&& DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \
8+
xz-utils \
9+
&& : # last line
10+
11+
# Setup toolchain
12+
WORKDIR /opt/telink
13+
RUN set -x \
14+
&& 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 \
15+
&& tar xvf zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz \
16+
&& rm -rf zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz \
17+
&& zephyr-sdk-0.17.0/setup.sh -t riscv64-zephyr-elf \
18+
&& : # last line
19+
20+
# Setup Zephyr version: 3.3.0; branch: develop_3.3
21+
ARG ZEPHYR_REVISION=fdccaba1ebc147908e9cca653e6c6743def3332b
22+
WORKDIR /opt/telink/zephyrproject
23+
RUN set -x \
24+
&& python3 -m pip install --break-system-packages -U --no-cache-dir west \
25+
&& git init zephyr \
26+
&& cd zephyr \
27+
&& git remote add origin https://github.com/telink-semi/zephyr \
28+
&& git fetch --depth=1 origin ${ZEPHYR_REVISION} \
29+
&& git reset ${ZEPHYR_REVISION} --hard \
30+
&& west init -l \
31+
&& west update -o=--depth=1 -n -f smart \
32+
&& west blobs fetch hal_telink \
33+
&& : # last line
34+
35+
FROM ghcr.io/project-chip/chip-build:${VERSION}
36+
37+
COPY --from=build /opt/telink/zephyr-sdk-0.17.0/ /opt/telink/zephyr-sdk-0.17.0/
38+
COPY --from=build /opt/telink/zephyrproject/ /opt/telink/zephyrproject/
39+
40+
RUN set -x \
41+
&& apt-get update \
42+
&& apt-get clean \
43+
&& rm -rf /var/lib/apt/lists/ \
44+
&& pip3 install --break-system-packages --no-cache-dir --user -r /opt/telink/zephyrproject/zephyr/scripts/requirements.txt \
45+
&& : # last line
46+
47+
ENV TELINK_ZEPHYR_BASE=/opt/telink/zephyrproject/zephyr
48+
ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.17.0
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../build.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../run.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../base/chip-build/version

integrations/docker/images/stage-2/chip-build-telink/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ RUN set -x \
1717
&& zephyr-sdk-0.17.0/setup.sh -t riscv64-zephyr-elf \
1818
&& : # last line
1919

20-
# Setup Zephyr
21-
ARG ZEPHYR_REVISION=fdccaba1ebc147908e9cca653e6c6743def3332b
20+
# Setup Zephyr version: 3.7.0; branch: develop
21+
ARG ZEPHYR_REVISION=46b82695b9390d74bcfa4b01a14a009c01b96895
2222
WORKDIR /opt/telink/zephyrproject
2323
RUN set -x \
2424
&& python3 -m pip install --break-system-packages -U --no-cache-dir west \
25-
&& git clone https://github.com/telink-semi/zephyr \
25+
&& git init zephyr \
2626
&& cd zephyr \
27+
&& git remote add origin https://github.com/telink-semi/zephyr \
28+
&& git fetch --depth=1 origin ${ZEPHYR_REVISION} \
2729
&& git reset ${ZEPHYR_REVISION} --hard \
2830
&& west init -l \
29-
&& cd .. \
3031
&& west update -o=--depth=1 -n -f smart \
3132
&& west blobs fetch hal_telink \
32-
&& west zephyr-export \
3333
&& : # last line
3434

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

0 commit comments

Comments
 (0)