From 2f5fa1a7e9f68c87f0f5edd1f4b50e9f8cce4c85 Mon Sep 17 00:00:00 2001
From: Peter Johanson <peter@peterjohanson.com>
Date: Sat, 8 Oct 2022 01:56:49 -0400
Subject: [PATCH] feat: Move to Zephyr 3.2/SDK 0.15.2

* SDK 0.15 supports a few more target architectures
* SDK was refactored to minimal zip then download toolchains, so refactor to that.
---
 .github/workflows/containers.yml |  4 ++--
 Dockerfile                       | 15 +++++++++++----
 architectures.yml                | 19 +++++++++++--------
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml
index 9fa9429..5379e1d 100644
--- a/.github/workflows/containers.yml
+++ b/.github/workflows/containers.yml
@@ -1,8 +1,8 @@
 name: Containers
 
 env:
-  zephyr-version: 3.0.0
-  zephyr-sdk-version: 0.13.2
+  zephyr-version: 3.2.0
+  zephyr-sdk-version: 0.15.1
   sha-abbrev-length: 12
   no-cache: ${{ secrets.NO_CACHE != null || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
   ignore-actions-cache: ${{ secrets.IGNORE_ACTIONS_CACHE != null }}
diff --git a/Dockerfile b/Dockerfile
index 8153fe9..969a08f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -88,14 +88,21 @@ ARG ARCHITECTURE
 ARG ZEPHYR_SDK_VERSION
 ARG ZEPHYR_SDK_INSTALL_DIR=/opt/zephyr-sdk-${ZEPHYR_SDK_VERSION}
 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 install --no-install-recommends \
   wget \
   xz-utils \
-  && wget -q "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${ZEPHYR_SDK_VERSION}/${sdk_file_name}" \
-  && sh ${sdk_file_name} --quiet -- -d ${ZEPHYR_SDK_INSTALL_DIR} \
-  && rm ${sdk_file_name} \
+  && cd ${TMP} \ 
+  && wget -q "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${ZEPHYR_SDK_VERSION}/${minimal_sdk_file_name}.tar.gz" \
+  && 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 \
   wget \
   xz-utils \
diff --git a/architectures.yml b/architectures.yml
index aca695f..e877cb9 100644
--- a/architectures.yml
+++ b/architectures.yml
@@ -1,15 +1,18 @@
 - arc
+- arc64
 - arm
-- arm64
+- aarch64
 - mips
 - nios2
 - riscv64
 - sparc
 - x86_64
-- xtensa_intel_apl_adsp
-- xtensa_intel_bdw_adsp
-- xtensa_intel_byt_adsp
-- xtensa_intel_s1000
-- xtensa_nxp_imx8m_adsp
-- xtensa_nxp_imx_adsp
-- xtensa_sample_controller
\ No newline at end of file
+- xtensa-espressif_esp32
+- xtensa-espressif_esp32s2
+- xtensa-intel_apl_adsp
+- xtensa-intel_bdw_adsp
+- xtensa-intel_byt_adsp
+- xtensa-intel_s1000
+- xtensa-nxp_imx8m_adsp
+- xtensa-nxp_imx_adsp
+- xtensa-sample_controller
\ No newline at end of file