|
3 | 3 | ARG BASE_IMAGE
|
4 | 4 | FROM ${BASE_IMAGE:-zephyrprojectrtos/ci-base:latest}
|
5 | 5 |
|
6 |
| -ARG ZSDK_VERSION=0.17.1-rc4 |
| 6 | +ARG ZSDK_VERSION=0.17.1 |
7 | 7 | ENV ZSDK_VERSION=$ZSDK_VERSION
|
8 | 8 | ARG KITWARE_NINJA_VERSION=1.11.1.g95dee.kitware.jobserver-1
|
9 | 9 | ENV KITWARE_NINJA_VERSION=$KITWARE_NINJA_VERSION
|
@@ -128,14 +128,6 @@ RUN mkdir -p /opt/protoc && \
|
128 | 128 | ln -s /opt/protoc/bin/protoc /usr/local/bin && \
|
129 | 129 | rm -f protoc-${PROTOC_VERSION}-linux-${PROTOC_HOSTTYPE}.zip
|
130 | 130 |
|
131 |
| -# Install Zephyr SDK |
132 |
| -RUN mkdir -p /opt/toolchains && \ |
133 |
| - cd /opt/toolchains && \ |
134 |
| - wget ${WGET_ARGS} https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${ZSDK_VERSION}/zephyr-sdk-${ZSDK_VERSION}_linux-${HOSTTYPE}.tar.xz && \ |
135 |
| - tar xf zephyr-sdk-${ZSDK_VERSION}_linux-${HOSTTYPE}.tar.xz && \ |
136 |
| - zephyr-sdk-${ZSDK_VERSION}/setup.sh -t all -h -c && \ |
137 |
| - rm zephyr-sdk-${ZSDK_VERSION}_linux-${HOSTTYPE}.tar.xz |
138 |
| - |
139 | 131 | # Install FVP
|
140 | 132 | #
|
141 | 133 | # Ecosystem FVP License permits redistribution (refer to the relevant license available in the container).
|
@@ -175,6 +167,15 @@ RUN set -o pipefail && \
|
175 | 167 | ; done && \
|
176 | 168 | ln -s /opt/fvps/*_pkg/models/*/FVP_* /usr/local/bin
|
177 | 169 |
|
| 170 | +# Install Zephyr SDK |
| 171 | +RUN mkdir -p /opt/toolchains && \ |
| 172 | + cd /opt/toolchains && \ |
| 173 | + wget ${WGET_ARGS} https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${ZSDK_VERSION}/zephyr-sdk-${ZSDK_VERSION}_linux-${HOSTTYPE}.tar.xz && \ |
| 174 | + tar xf zephyr-sdk-${ZSDK_VERSION}_linux-${HOSTTYPE}.tar.xz && \ |
| 175 | + zephyr-sdk-${ZSDK_VERSION}/setup.sh -t all -h -c && \ |
| 176 | + rm zephyr-sdk-${ZSDK_VERSION}_linux-${HOSTTYPE}.tar.xz |
| 177 | + |
| 178 | + |
178 | 179 | # Clean up stale packages
|
179 | 180 | RUN apt-get clean -y && \
|
180 | 181 | apt-get autoremove --purge -y && \
|
|
0 commit comments