Skip to content

Commit 394dd1b

Browse files
committed
change(esptool): Update esptool to 4.8.0
1 parent bcc55ea commit 394dd1b

File tree

2 files changed

+30
-21
lines changed

2 files changed

+30
-21
lines changed

Diff for: package/package_esp32_index.template.json

+21-21
Original file line numberDiff line numberDiff line change
@@ -460,14 +460,14 @@
460460
},
461461
{
462462
"name": "esptool_py",
463-
"version": "4.6",
463+
"version": "4.8.0",
464464
"systems": [
465465
{
466466
"host": "x86_64-pc-linux-gnu",
467-
"url": "https://github.com/espressif/arduino-esp32/releases/download/2.0.9/esptool-v4.6-src.tar.gz",
468-
"archiveFileName": "esptool-v4.6-src.tar.gz",
469-
"checksum": "SHA-256:22f9bad0cd1cea14e554ac1f4a6d8f67415ff7029a66ce9130756276e7264e5a",
470-
"size": "99141"
467+
"url": "https://github.com/espressif/esptool/releases/download/v4.8.0/esptool-v4.8.0-linux-amd64.zip",
468+
"archiveFileName": "esptool-v4.8.0-linux-amd64.zip",
469+
"checksum": "SHA-256:e637adc204b74b980013e89dafce6e056401ec26c94e205b0158075a836c56c6",
470+
"size": "64617780"
471471
},
472472
{
473473
"host": "i686-pc-linux-gnu",
@@ -478,31 +478,31 @@
478478
},
479479
{
480480
"host": "aarch64-linux-gnu",
481-
"url": "https://github.com/espressif/arduino-esp32/releases/download/2.0.9/esptool-v4.6-src.tar.gz",
482-
"archiveFileName": "esptool-v4.6-src.tar.gz",
483-
"checksum": "SHA-256:22f9bad0cd1cea14e554ac1f4a6d8f67415ff7029a66ce9130756276e7264e5a",
484-
"size": "99141"
481+
"url": "https://github.com/espressif/esptool/releases/download/v4.8.0/esptool-v4.8.0-linux-arm64.zip",
482+
"archiveFileName": "esptool-v4.8.0-linux-arm64.zip",
483+
"checksum": "SHA-256:c3a7749bed8d1929b0ad35743cc5557d60ecb81a10ffac28cb55ed1545e0223a",
484+
"size": "54432155"
485485
},
486486
{
487487
"host": "arm-linux-gnueabihf",
488-
"url": "https://github.com/espressif/arduino-esp32/releases/download/2.0.9/esptool-v4.6-src.tar.gz",
489-
"archiveFileName": "esptool-v4.6-src.tar.gz",
490-
"checksum": "SHA-256:22f9bad0cd1cea14e554ac1f4a6d8f67415ff7029a66ce9130756276e7264e5a",
491-
"size": "99141"
488+
"url": "https://github.com/espressif/esptool/releases/download/v4.8.0/esptool-v4.8.0-linux-arm32.zip",
489+
"archiveFileName": "esptool-v4.8.0-linux-arm32.zip",
490+
"checksum": "SHA-256:b781a86b53a17d24e02996c0a7958f9b76f6873fc1cc07c64ab6326e19395570",
491+
"size": "45858426"
492492
},
493493
{
494494
"host": "x86_64-apple-darwin",
495-
"url": "https://github.com/espressif/arduino-esp32/releases/download/2.0.9/esptool-v4.6-macos.tar.gz",
496-
"archiveFileName": "esptool-v4.6-macos.tar.gz",
497-
"checksum": "SHA-256:885ec69fcffdcb9e7c6eacd2589f13a45ce6bcb6742bea368ec3a73bcca6dd59",
498-
"size": "5851297"
495+
"url": "https://github.com/espressif/esptool/releases/download/v4.8.0/esptool-v4.8.0-macos.zip",
496+
"archiveFileName": "esptool-v4.8.0-macos.zip",
497+
"checksum": "SHA-256:73bba755d2da15ef18b8b8d8fe37c459d296648efb02d5449a3fc0035930306a",
498+
"size": "29821710"
499499
},
500500
{
501501
"host": "x86_64-mingw32",
502-
"url": "https://github.com/espressif/arduino-esp32/releases/download/2.0.9/esptool-v4.6-win64.zip",
503-
"archiveFileName": "esptool-v4.6-win64.zip",
504-
"checksum": "SHA-256:c7c68cd1aa520cbfce488ff6a77818ece272272eb012831b9d9ab1280a7c393f",
505-
"size": "6638480"
502+
"url": "https://github.com/espressif/esptool/releases/download/v4.8.0/esptool-v4.8.0-win64.zip",
503+
"archiveFileName": "esptool-v4.8.0-win64.zip",
504+
"checksum": "SHA-256:5575beabfe8c1c1ea7c1a0f1bd42ee97ac3f4c4dae5fc74cda58be0e23016da3",
505+
"size": "33608471"
506506
},
507507
{
508508
"host": "i686-mingw32",

Diff for: tools/get.py

+9
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import re
2525
import time
2626
import argparse
27+
import stat
2728

2829
# Initialize start_time globally
2930
start_time = -1
@@ -177,6 +178,7 @@ def is_latest_version(destination, dirname, rename_to, cfile, checksum):
177178

178179

179180
def unpack(filename, destination, force_extract, checksum): # noqa: C901
181+
sys_name = platform.system()
180182
dirname = ""
181183
cfile = None # Compressed file
182184
file_is_corrupted = False
@@ -223,6 +225,8 @@ def unpack(filename, destination, force_extract, checksum): # noqa: C901
223225
rename_to = re.match(r"^([a-z][^\-]*\-*)+", dirname).group(0).strip("-")
224226
if rename_to == dirname and dirname.startswith("esp32-arduino-libs-"):
225227
rename_to = "esp32-arduino-libs"
228+
elif rename_to == dirname and dirname.startswith("esptool-"):
229+
rename_to = "esptool"
226230

227231
if not force_extract:
228232
if is_latest_version(destination, dirname, rename_to, cfile, checksum):
@@ -256,6 +260,11 @@ def unpack(filename, destination, force_extract, checksum): # noqa: C901
256260
print("Renaming {0} to {1} ...".format(dirname, rename_to))
257261
shutil.move(dirname, rename_to)
258262

263+
# Add execute permission to esptool on non-Windows platforms
264+
if rename_to.startswith("esptool") and "CYGWIN_NT" not in sys_name:
265+
st = os.stat(os.path.join(destination, rename_to, "esptool"))
266+
os.chmod(os.path.join(destination, rename_to, "esptool"), st.st_mode | 0o111)
267+
259268
with open(os.path.join(destination, rename_to, ".package_checksum"), "w") as f:
260269
f.write(checksum)
261270

0 commit comments

Comments
 (0)