Skip to content

Commit d313b3e

Browse files
authored
SDK 0.13.2, remove ALT_SDK (zephyrproject-rtos#9)
1 parent 84cc496 commit d313b3e

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

Dockerfile

+2-7
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ ENV NO_PROXY=$NOPROXY
1919
ENV HTTP_PROXY=$HTTPPROXY
2020
ENV HTTPS_PROXY=$HTTPSPROXY
2121

22-
ARG ZSDK_VERSION=0.12.4
23-
ARG ZSDK_ALT_VERSION=0.13.1
22+
ARG ZSDK_VERSION=0.13.2
2423
ARG GCC_ARM_NAME=gcc-arm-none-eabi-10-2020-q4-major
2524
ARG CMAKE_VERSION=3.20.5
2625
ARG RENODE_VERSION=1.12.0
@@ -167,10 +166,6 @@ RUN cd /opt/bsim && \
167166
# sh "zephyr-sdk-${ZSDK_VERSION}-x86_64-linux-setup.run" --quiet -- -d /opt/toolchains/zephyr-sdk-${ZSDK_VERSION} && \
168167
# rm "zephyr-sdk-${ZSDK_VERSION}-x86_64-linux-setup.run"
169168

170-
#RUN wget ${WGET_ARGS} https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${ZSDK_ALT_VERSION}/zephyr-sdk-${ZSDK_ALT_VERSION}-linux-x86_64-setup.run && \
171-
# sh "zephyr-sdk-${ZSDK_ALT_VERSION}-linux-x86_64-setup.run" --quiet -- -d /opt/toolchains/zephyr-sdk-${ZSDK_ALT_VERSION} && \
172-
# rm "zephyr-sdk-${ZSDK_ALT_VERSION}-linux-x86_64-setup.run"
173-
174169
# Install github-cli per https://github.com/cli/cli/blob/trunk/docs/install_linux.md
175170
RUN apt update && apt install -y --no-install-recommends curl && \
176171
curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | gpg --dearmor -o /usr/share/keyrings/githubcli-archive-keyring.gpg && \
@@ -208,7 +203,7 @@ RUN chmod -R 755 /opt/1rtos
208203

209204
# Set the locale
210205
ENV ZEPHYR_TOOLCHAIN_VARIANT=zephyr
211-
ENV ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-${ZSDK_ALT_VERSION}
206+
ENV ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-${ZSDK_VERSION}
212207
ENV GNUARMEMB_TOOLCHAIN_PATH=/opt/toolchains/${GCC_ARM_NAME}
213208
ENV PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
214209

0 commit comments

Comments
 (0)