sporq/zmk-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Move to Zephyr 3.2/SDK 0.15.2

Browse Source 
* SDK 0.15 supports a few more target architectures
* SDK was refactored to minimal zip then download toolchains, so refactor to that.
This commit is contained in:
Peter Johanson 2022-10-08 01:56:49 -04:00 committed by Pete Johanson
parent 6c08730b47
commit 2f5fa1a7e9
3 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/containers.yml vendored
View File

@ -1,8 +1,8 @@
name: Containers name: Containers
env: env:
zephyr-version: 3.0.0 zephyr-version: 3.2.0
zephyr-sdk-version: 0.13.2 zephyr-sdk-version: 0.15.1
sha-abbrev-length: 12 sha-abbrev-length: 12
no-cache: ${{ secrets.NO_CACHE != null || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }} no-cache: ${{ secrets.NO_CACHE != null || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
ignore-actions-cache: ${{ secrets.IGNORE_ACTIONS_CACHE != null }} ignore-actions-cache: ${{ secrets.IGNORE_ACTIONS_CACHE != null }}

15
Dockerfile
View File

@ -88,14 +88,21 @@ ARG ARCHITECTURE
ARG ZEPHYR_SDK_VERSION ARG ZEPHYR_SDK_VERSION
ARG ZEPHYR_SDK_INSTALL_DIR=/opt/zephyr-sdk-${ZEPHYR_SDK_VERSION} ARG ZEPHYR_SDK_INSTALL_DIR=/opt/zephyr-sdk-${ZEPHYR_SDK_VERSION}
RUN \ RUN \
export sdk_file_name="zephyr-toolchain-${ARCHITECTURE}-${ZEPHYR_SDK_VERSION}-linux-$(uname -m)-setup.run" \ export minimal_sdk_file_name="zephyr-sdk-${ZEPHYR_SDK_VERSION}_linux-$(uname -m)_minimal" \
&& if [ "${ARCHITECTURE}" = "arm" ]; then arch_format="eabi"; else arch_format="elf"; fi \
&& if [ "${ARCHITECTURE#xtensa}" = "${ARCHITECTURE}" ]; then arch_sep="-"; else arch_sep="_"; fi \
&& apt-get -y update \ && apt-get -y update \
&& apt-get -y install --no-install-recommends \ && apt-get -y install --no-install-recommends \
wget \ wget \
xz-utils \ xz-utils \
&& wget -q "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${ZEPHYR_SDK_VERSION}/${sdk_file_name}" \ && cd ${TMP} \
&& sh ${sdk_file_name} --quiet -- -d ${ZEPHYR_SDK_INSTALL_DIR} \ && wget -q "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${ZEPHYR_SDK_VERSION}/${minimal_sdk_file_name}.tar.gz" \
&& rm ${sdk_file_name} \ && tar xvfz ${minimal_sdk_file_name}.tar.gz \
&& mv zephyr-sdk-${ZEPHYR_SDK_VERSION} /opt/ \
&& rm ${minimal_sdk_file_name}.tar.gz \
&& cd /opt/zephyr-sdk-${ZEPHYR_SDK_VERSION} \
&& ./setup.sh -h -c -t ${ARCHITECTURE}${arch_sep}zephyr-${arch_format} \
&& cd \
&& apt-get remove -y --purge \ && apt-get remove -y --purge \
wget \ wget \
xz-utils \ xz-utils \

19
architectures.yml
View File

@ -1,15 +1,18 @@
- arc - arc
- arc64
- arm - arm
- arm64 - aarch64
- mips - mips
- nios2 - nios2
- riscv64 - riscv64
- sparc - sparc
- x86_64 - x86_64
- xtensa_intel_apl_adsp - xtensa-espressif_esp32
- xtensa_intel_bdw_adsp - xtensa-espressif_esp32s2
- xtensa_intel_byt_adsp - xtensa-intel_apl_adsp
- xtensa_intel_s1000 - xtensa-intel_bdw_adsp
- xtensa_nxp_imx8m_adsp - xtensa-intel_byt_adsp
- xtensa_nxp_imx_adsp - xtensa-intel_s1000
- xtensa_sample_controller - xtensa-nxp_imx8m_adsp
- xtensa-nxp_imx_adsp
- xtensa-sample_controller