From 6ae22d9f3b2f03d970b118d8b3f42739828baeb7 Mon Sep 17 00:00:00 2001 From: Erhan Kurubas Date: Wed, 13 Apr 2022 22:11:28 +0200 Subject: [PATCH] tools: add distro links for macos-arm64 --- tools/idf_tools.py | 5 ++-- tools/tools.json | 53 ++++++++++++++++++++++++++++++++++++++++- tools/tools_schema.json | 2 +- 3 files changed, 56 insertions(+), 4 deletions(-) diff --git a/tools/idf_tools.py b/tools/idf_tools.py index 69851be55d..b4a1c8a6a4 100755 --- a/tools/idf_tools.py +++ b/tools/idf_tools.py @@ -96,6 +96,7 @@ PYTHON_PLATFORM = platform.system() + '-' + platform.machine() PLATFORM_WIN32 = 'win32' PLATFORM_WIN64 = 'win64' PLATFORM_MACOS = 'macos' +PLATFORM_MACOS_ARM64 = 'macos-arm64' PLATFORM_LINUX32 = 'linux-i686' PLATFORM_LINUX64 = 'linux-amd64' PLATFORM_LINUX_ARM32 = 'linux-armel' @@ -120,8 +121,8 @@ PLATFORM_FROM_NAME = { 'osx': PLATFORM_MACOS, 'darwin': PLATFORM_MACOS, 'Darwin-x86_64': PLATFORM_MACOS, - # pretend it is x86_64 until Darwin-arm64 tool builds are available: - 'Darwin-arm64': PLATFORM_MACOS, + PLATFORM_MACOS_ARM64: PLATFORM_MACOS_ARM64, + 'Darwin-arm64': PLATFORM_MACOS_ARM64, # Linux PLATFORM_LINUX64: PLATFORM_LINUX64, 'linux64': PLATFORM_LINUX64, diff --git a/tools/tools.json b/tools/tools.json index 6809ee8b0d..62115bfc08 100644 --- a/tools/tools.json +++ b/tools/tools.json @@ -54,6 +54,11 @@ "size": 97807647, "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2-patch3/xtensa-esp32-elf-gcc8_4_0-esp-2021r2-patch3-macos.tar.gz" }, + "macos-arm64": { + "sha256": "dda3d7a43efd995d9a51d5a5741626dbf915df46078aef0b5aea7163ac82398b", + "size": 97807647, + "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2-patch3/xtensa-esp32-elf-gcc8_4_0-esp-2021r2-patch3-macos.tar.gz" + }, "name": "esp-2021r2-patch3-8.4.0", "status": "recommended", "win32": { @@ -123,6 +128,11 @@ "size": 98224709, "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2-patch3/xtensa-esp32s2-elf-gcc8_4_0-esp-2021r2-patch3-macos.tar.gz" }, + "macos-arm64": { + "sha256": "de9af641678c93775e932ee5ec4f478f8925cfc1ebc22e41adc4fb85430a0c35", + "size": 98224709, + "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2-patch3/xtensa-esp32s2-elf-gcc8_4_0-esp-2021r2-patch3-macos.tar.gz" + }, "name": "esp-2021r2-patch3-8.4.0", "status": "recommended", "win32": { @@ -192,6 +202,11 @@ "size": 98553473, "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2-patch3/xtensa-esp32s3-elf-gcc8_4_0-esp-2021r2-patch3-macos.tar.gz" }, + "macos-arm64": { + "sha256": "e5af78f05d3af07617805d06ebb45ff2fe9b6aed6970a84c35eea28a5d8d5e53", + "size": 98553473, + "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2-patch3/xtensa-esp32s3-elf-gcc8_4_0-esp-2021r2-patch3-macos.tar.gz" + }, "name": "esp-2021r2-patch3-8.4.0", "status": "recommended", "win32": { @@ -242,6 +257,11 @@ "size": 89888488, "url": "https://github.com/espressif/llvm-project/releases/download/esp-12.0.1-20210914/xtensa-esp32-elf-llvm12_0_1-esp-12.0.1-20210914-macos.tar.xz" }, + "macos-arm64": { + "sha256": "6e7413e5fa515e403859ecf5301bdcdc3f8bf12c5de9aecaa11e9f17f32b05db", + "size": 89888488, + "url": "https://github.com/espressif/llvm-project/releases/download/esp-12.0.1-20210914/xtensa-esp32-elf-llvm12_0_1-esp-12.0.1-20210914-macos.tar.xz" + }, "name": "12.0.1-d9341b81fc", "status": "recommended", "win64": { @@ -309,6 +329,11 @@ "size": 113703959, "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2-patch3/riscv32-esp-elf-gcc8_4_0-esp-2021r2-patch3-macos.tar.gz" }, + "macos-arm64": { + "sha256": "4aacc1742a76349d790b1ac8e9e9d963daefda5346dbd6741cfe8e7a35a44e4e", + "size": 113703959, + "url": "https://github.com/espressif/crosstool-NG/releases/download/esp-2021r2-patch3/riscv32-esp-elf-gcc8_4_0-esp-2021r2-patch3-macos.tar.gz" + }, "name": "esp-2021r2-patch3-8.4.0", "status": "recommended", "win32": { @@ -371,6 +396,11 @@ "size": 8872874, "url": "https://github.com/espressif/binutils-esp32ulp/releases/download/v2.28.51-esp-20191205/binutils-esp32ulp-macos-2.28.51-esp-20191205.tar.gz" }, + "macos-arm64": { + "sha256": "a35d9e7a0445247c7fc9dccd3fbc35682f0fafc28beeb10c94b59466317190c4", + "size": 8872874, + "url": "https://github.com/espressif/binutils-esp32ulp/releases/download/v2.28.51-esp-20191205/binutils-esp32ulp-macos-2.28.51-esp-20191205.tar.gz" + }, "name": "2.28.51-esp-20191205", "status": "recommended", "win32": { @@ -434,6 +464,11 @@ "size": 8876194, "url": "https://github.com/espressif/binutils-esp32ulp/releases/download/v2.28.51-esp-20191205/binutils-esp32s2ulp-macos-2.28.51-esp-20191205.tar.gz" }, + "macos-arm64": { + "sha256": "5a9bb678a5246638cbda303f523d9bb8121a9a24dc01ecb22c21c46c41184155", + "size": 8876194, + "url": "https://github.com/espressif/binutils-esp32ulp/releases/download/v2.28.51-esp-20191205/binutils-esp32s2ulp-macos-2.28.51-esp-20191205.tar.gz" + }, "name": "2.28.51-esp-20191205", "status": "recommended", "win32": { @@ -478,7 +513,8 @@ ] ], "platforms": [ - "macos" + "macos", + "macos-arm64" ] } ], @@ -513,6 +549,11 @@ "size": 66311879, "url": "https://github.com/Kitware/CMake/releases/download/v3.20.3/cmake-3.20.3-macos-universal.tar.gz" }, + "macos-arm64": { + "sha256": "5f72dba3aa5f3800fb29ab6115ae0b31f10bdb2aad66204e14c98f6ac7e6b6ed", + "size": 66311879, + "url": "https://github.com/Kitware/CMake/releases/download/v3.20.3/cmake-3.20.3-macos-universal.tar.gz" + }, "name": "3.20.3", "status": "recommended", "win32": { @@ -586,6 +627,11 @@ "size": 2125935, "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.11.0-esp32-20220411/openocd-esp32-macos-0.11.0-esp32-20220411.tar.gz" }, + "macos-arm64": { + "sha256": "19448f0d4aaafa85c93c86e363ca879e5ccdcfdda42ba5ce4ac3817e9d8eecdb", + "size": 2165892, + "url": "https://github.com/espressif/openocd-esp32/releases/download/v0.11.0-esp32-20220411/openocd-esp32-macos-arm64-0.11.0-esp32-20220411.tar.gz" + }, "name": "v0.11.0-esp32-20220411", "status": "recommended", "win32": { @@ -642,6 +688,11 @@ "size": 240112, "url": "https://dl.espressif.com/dl/ninja-1.10.2-osx.tar.gz" }, + "macos-arm64": { + "sha256": "847bb1ca4bc16d8dba6aeed3ecb5055498b86bc68c364c37583eb5738bb440f1", + "size": 240112, + "url": "https://dl.espressif.com/dl/ninja-1.10.2-osx.tar.gz" + }, "name": "1.10.2", "status": "recommended", "win64": { diff --git a/tools/tools_schema.json b/tools/tools_schema.json index cd6be7dd4d..f09044d622 100644 --- a/tools/tools_schema.json +++ b/tools/tools_schema.json @@ -200,7 +200,7 @@ "type": "array", "items": { "type": "string", - "enum": ["linux-i686", "linux-amd64", "linux-armel", "linux-arm64", "macos", "win32", "win64"] + "enum": ["linux-i686", "linux-amd64", "linux-armel", "linux-arm64", "macos", "macos-arm64", "win32", "win64"] } }, "export_paths": {