Skip to content

Commit c06403f

Browse files
fix silabs dockerfile (project-chip#40475)
1 parent 362022f commit c06403f

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
156 : [Silabs] Comment out slc-cli retrieval
1+
157 : [Silabs] Fix slc-cli retrieval

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,10 @@ RUN git clone --depth=1 --single-branch --branch=v3.5.0 https://github.com/Silic
4141
# SLC-cli install
4242
# TODO: figure out a way to make this a fixed version. Currently a moving target.
4343

44-
# TODO uncomment once logging issue is fixed 40472
45-
# RUN wget https://www.silabs.com/documents/login/software/slc_cli_linux.zip && \
46-
# unzip ./slc_cli_linux.zip -d /tmp && \
47-
# rm ./slc_cli_linux.zip \
48-
# && : # last line
44+
RUN wget https://www.silabs.com/documents/public/software/slc_cli_linux.zip && \
45+
unzip ./slc_cli_linux.zip -d /tmp && \
46+
rm ./slc_cli_linux.zip \
47+
&& : # last line
4948

5049
# Final SDK container for compiling using Silabs SDK
5150
FROM ghcr.io/project-chip/chip-build:${VERSION}
@@ -72,11 +71,9 @@ ENV GSDK_ROOT=/opt/silabs/simplicity_sdk/
7271
ENV SISDK_ROOT=/opt/silabs/simplicity_sdk/
7372
ENV WISECONNECT_SDK_ROOT=/opt/silabs/wiseconnect-wifi-bt-sdk/
7473
ENV WIFI_SDK_ROOT=/opt/silabs/wifi_sdk/
75-
# TODO issue 40472
76-
# ENV PATH="${PATH}:/opt/silabs/slc_cli/"
74+
ENV PATH="${PATH}:/opt/silabs/slc_cli/"
7775

7876
COPY --from=build /tmp/simplicity_sdk /opt/silabs/simplicity_sdk
7977
COPY --from=build /tmp/wiseconnect-wifi-bt-sdk/ /opt/silabs/wiseconnect-wifi-bt-sdk/
8078
COPY --from=build /tmp/wifi_sdk /opt/silabs/wifi_sdk
81-
# TODO issue 40472
82-
# COPY --from=build /tmp/slc_cli /opt/silabs/slc_cli
79+
COPY --from=build /tmp/slc_cli /opt/silabs/slc_cli

0 commit comments

Comments
 (0)