Skip to content

Commit 71ab81b

Browse files
authored
Zephyr v3.7.0 -> v4.2.0 (#46)
1 parent 6c25773 commit 71ab81b

File tree

1 file changed

+22
-5
lines changed

1 file changed

+22
-5
lines changed

Dockerfile

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@
77
# bcdevices/zsdk-zephyr-jammy
88
FROM buildpack-deps:jammy-scm
99

10-
ARG ZSDK_VERSION="0.17.0"
11-
ARG ZEPHYR_VERSION="3.7.0"
10+
ARG ZSDK_VERSION="0.17.3"
11+
ARG ZEPHYR_VERSION="4.2.0"
1212

1313
ARG ZSDK_ROOT_DIR="/opt/toolchains"
1414
ARG ZEPHYR_SRC_DIR="/usr/src"
1515
ARG ZEPHYR_INSTALL_DIR="${ZEPHYR_SRC_DIR}/zephyr-${ZEPHYR_VERSION}"
16+
ARG TOOLCHAINS="arm-zephyr-eabi"
1617

1718
ARG PKGS
1819
ENV PKGS="${PKGS} ccache"
@@ -41,6 +42,11 @@ ENV PKGS="${PKGS} python3-pip"
4142
ENV PKGS="${PKGS} python3-setuptools"
4243
ENV PKGS="${PKGS} python3-tk"
4344
ENV PKGS="${PKGS} python3-wheel"
45+
ENV PKGS="${PKGS} python3-venv"
46+
ENV PKGS="${PKGS} libusb-1.0-0"
47+
ENV PKGS="${PKGS} libglib2.0-dev"
48+
ENV PKGS="${PKGS} usbutils"
49+
ENV PKGS="${PKGS} rsync"
4450
ENV PKGS="${PKGS} software-properties-common"
4551
ENV PKGS="${PKGS} srecord"
4652
ENV PKGS="${PKGS} qemu"
@@ -90,7 +96,7 @@ RUN zsdk_txz="zephyr-sdk-${ZSDK_VERSION}_linux-$(uname -m).tar.xz" \
9096
&& wget -O zsdk.txz "${url}" --progress=dot:giga ${WGET_ARGS} \
9197
&& tar xf zsdk.txz \
9298
&& rm -f zsdk.txz \
93-
&& "./zephyr-sdk-${ZSDK_VERSION}/setup.sh" -c -t arm-zephyr-eabi
99+
&& "./zephyr-sdk-${ZSDK_VERSION}/setup.sh" -c -h -t ${TOOLCHAINS}
94100

95101
ENV ZEPHYR_TOOLCHAIN_VARIANT="zephyr"
96102
ENV ZEPHYR_SDK_INSTALL_DIR="${ZSDK_ROOT_DIR}/zephyr-sdk-${ZSDK_VERSION}"
@@ -99,7 +105,7 @@ ENV ZEPHYR_SDK_INSTALL_DIR="${ZSDK_ROOT_DIR}/zephyr-sdk-${ZSDK_VERSION}"
99105
# DL3042: `pip install --no-cache-dir <package>`
100106
# hadolint ignore=DL3013,DL3042
101107
RUN python3 -m pip install -U pip \
102-
&& pip3 install --upgrade west
108+
&& pip3 install --break-system-packages --upgrade west
103109

104110
WORKDIR "${ZEPHYR_INSTALL_DIR}"
105111

@@ -108,4 +114,15 @@ WORKDIR "${ZEPHYR_INSTALL_DIR}"
108114
RUN west init --mr "v${ZEPHYR_VERSION}" \
109115
&& west update \
110116
&& west zephyr-export \
111-
&& pip3 install -r zephyr/scripts/requirements.txt
117+
&& pip3 install --break-system-packages -r zephyr/scripts/requirements.txt
118+
119+
ENV CCACHE_DIR="/.ccache" \
120+
CCACHE_MAXSIZE="5G" \
121+
CCACHE_COMPRESS="1" \
122+
XDG_CACHE_HOME="/root/.cache" \
123+
PIP_CACHE_DIR="/root/.cache/pip"
124+
125+
RUN mkdir -p "${CCACHE_DIR}" "${PIP_CACHE_DIR}" \
126+
&& chmod -R 777 "${CCACHE_DIR}"
127+
128+
RUN git config --system --add safe.directory '*'

0 commit comments

Comments
 (0)