Skip to content

Commit 7bc80a4

Browse files
me-no-devme-no-dev
committed
Switch SDK to be an external package
1 parent b4f6db6 commit 7bc80a4

File tree

7,669 files changed

+74
-1754723
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

7,669 files changed

+74
-1754723
lines changed

‎.github/scripts/on-release.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ cp -f "$GITHUB_WORKSPACE/tools/gen_insights_package.py" "$PKG_DIR/tools/"
185185
cp -f "$GITHUB_WORKSPACE/tools/gen_insights_package.exe" "$PKG_DIR/tools/"
186186
cp -Rf "$GITHUB_WORKSPACE/tools/partitions" "$PKG_DIR/tools/"
187187
cp -Rf "$GITHUB_WORKSPACE/tools/ide-debug" "$PKG_DIR/tools/"
188-
cp -Rf "$GITHUB_WORKSPACE/tools/sdk" "$PKG_DIR/tools/"
189188
cp -f $GITHUB_WORKSPACE/tools/platformio-build*.py "$PKG_DIR/tools/"
190189

191190
# Remove unnecessary files in the package folder
@@ -197,6 +196,7 @@ find "$PKG_DIR" -name '*.git*' -type f -delete
197196
echo "Generating platform.txt..."
198197
cat "$GITHUB_WORKSPACE/platform.txt" | \
199198
sed "s/version=.*/version=$ver$extent/g" | \
199+
sed 's/tools.esp32-arduino-libs.path={runtime.platform.path}\/tools\/esp32-arduino-libs/tools.esp32-arduino-libs.path=\{runtime.tools.esp32-arduino-libs.path\}/g' | \
200200
sed 's/tools.xtensa-esp32-elf-gcc.path={runtime.platform.path}\/tools\/xtensa-esp32-elf/tools.xtensa-esp32-elf-gcc.path=\{runtime.tools.xtensa-esp32-elf-gcc.path\}/g' | \
201201
sed 's/tools.xtensa-esp32s2-elf-gcc.path={runtime.platform.path}\/tools\/xtensa-esp32s2-elf/tools.xtensa-esp32s2-elf-gcc.path=\{runtime.tools.xtensa-esp32s2-elf-gcc.path\}/g' | \
202202
sed 's/tools.xtensa-esp32s3-elf-gcc.path={runtime.platform.path}\/tools\/xtensa-esp32s3-elf/tools.xtensa-esp32s3-elf-gcc.path=\{runtime.tools.xtensa-esp32s3-elf-gcc.path\}/g' | \

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
tools/esp32-arduino-libs
12
tools/xtensa-esp32-elf
23
tools/xtensa-esp32s2-elf
34
tools/xtensa-esp32s3-elf

‎package/package_esp32_index.template.json

+67
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@
3636
}
3737
],
3838
"toolsDependencies": [
39+
{
40+
"packager": "esp32",
41+
"name": "esp32-arduino-libs",
42+
"version": "idf-release_v5.1-420ebd208a"
43+
},
3944
{
4045
"packager": "esp32",
4146
"name": "xtensa-esp32-elf-gcc",
@@ -90,6 +95,68 @@
9095
}
9196
],
9297
"tools": [
98+
{
99+
"name": "esp32-arduino-libs",
100+
"version": "idf-release_v5.1-420ebd208a",
101+
"systems": [
102+
{
103+
"host": "i686-mingw32",
104+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/59f667ae890e6e9ec2d3f650f35aae3e638d9802",
105+
"archiveFileName": "esp32-arduino-libs-59f667ae890e6e9ec2d3f650f35aae3e638d9802.zip",
106+
"checksum": "SHA-256:2da5dfc0ab9abf125af0a0f8d3bd0306eb2870d7958c959117bf7a4940a2d85c",
107+
"size": "216068993"
108+
},
109+
{
110+
"host": "x86_64-mingw32",
111+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/59f667ae890e6e9ec2d3f650f35aae3e638d9802",
112+
"archiveFileName": "esp32-arduino-libs-59f667ae890e6e9ec2d3f650f35aae3e638d9802.zip",
113+
"checksum": "SHA-256:2da5dfc0ab9abf125af0a0f8d3bd0306eb2870d7958c959117bf7a4940a2d85c",
114+
"size": "216068993"
115+
},
116+
{
117+
"host": "arm64-apple-darwin",
118+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/59f667ae890e6e9ec2d3f650f35aae3e638d9802",
119+
"archiveFileName": "esp32-arduino-libs-59f667ae890e6e9ec2d3f650f35aae3e638d9802.zip",
120+
"checksum": "SHA-256:2da5dfc0ab9abf125af0a0f8d3bd0306eb2870d7958c959117bf7a4940a2d85c",
121+
"size": "216068993"
122+
},
123+
{
124+
"host": "x86_64-apple-darwin",
125+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/59f667ae890e6e9ec2d3f650f35aae3e638d9802",
126+
"archiveFileName": "esp32-arduino-libs-59f667ae890e6e9ec2d3f650f35aae3e638d9802.zip",
127+
"checksum": "SHA-256:2da5dfc0ab9abf125af0a0f8d3bd0306eb2870d7958c959117bf7a4940a2d85c",
128+
"size": "216068993"
129+
},
130+
{
131+
"host": "x86_64-pc-linux-gnu",
132+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/59f667ae890e6e9ec2d3f650f35aae3e638d9802",
133+
"archiveFileName": "esp32-arduino-libs-59f667ae890e6e9ec2d3f650f35aae3e638d9802.zip",
134+
"checksum": "SHA-256:2da5dfc0ab9abf125af0a0f8d3bd0306eb2870d7958c959117bf7a4940a2d85c",
135+
"size": "216068993"
136+
},
137+
{
138+
"host": "i686-pc-linux-gnu",
139+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/59f667ae890e6e9ec2d3f650f35aae3e638d9802",
140+
"archiveFileName": "esp32-arduino-libs-59f667ae890e6e9ec2d3f650f35aae3e638d9802.zip",
141+
"checksum": "SHA-256:2da5dfc0ab9abf125af0a0f8d3bd0306eb2870d7958c959117bf7a4940a2d85c",
142+
"size": "216068993"
143+
},
144+
{
145+
"host": "aarch64-linux-gnu",
146+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/59f667ae890e6e9ec2d3f650f35aae3e638d9802",
147+
"archiveFileName": "esp32-arduino-libs-59f667ae890e6e9ec2d3f650f35aae3e638d9802.zip",
148+
"checksum": "SHA-256:2da5dfc0ab9abf125af0a0f8d3bd0306eb2870d7958c959117bf7a4940a2d85c",
149+
"size": "216068993"
150+
},
151+
{
152+
"host": "arm-linux-gnueabihf",
153+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/59f667ae890e6e9ec2d3f650f35aae3e638d9802",
154+
"archiveFileName": "esp32-arduino-libs-59f667ae890e6e9ec2d3f650f35aae3e638d9802.zip",
155+
"checksum": "SHA-256:2da5dfc0ab9abf125af0a0f8d3bd0306eb2870d7958c959117bf7a4940a2d85c",
156+
"size": "216068993"
157+
}
158+
]
159+
},
93160
{
94161
"name": "xtensa-esp32-elf-gcc",
95162
"version": "esp-12.2.0_20230208",

‎platform.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name=ESP32 Arduino
22
version=2.0.6
33

4+
tools.esp32-arduino-libs.path={runtime.platform.path}/tools/esp32-arduino-libs
45
tools.xtensa-esp32-elf-gcc.path={runtime.platform.path}/tools/xtensa-esp32-elf
56
tools.xtensa-esp32s2-elf-gcc.path={runtime.platform.path}/tools/xtensa-esp32s2-elf
67
tools.xtensa-esp32s3-elf-gcc.path={runtime.platform.path}/tools/xtensa-esp32s3-elf
@@ -32,7 +33,7 @@ tools.gen_insights_pkg.cmd.windows="{runtime.platform.path}/tools/gen_insights_p
3233
compiler.path={tools.{build.tarch}-{build.target}-elf-gcc.path}/bin/
3334
compiler.prefix={build.tarch}-{build.target}-elf-
3435

35-
compiler.sdk.path={runtime.platform.path}/tools/sdk/{build.mcu}
36+
compiler.sdk.path={tools.esp32-arduino-libs.path}/{build.mcu}
3637

3738
# EXPERIMENTAL feature: optimization flags
3839
# - this is alpha and may be subject to change without notice

0 commit comments

Comments
 (0)