Skip to content

Commit 6b77769

Browse files
author
Jamie C. Driver
committed
scripts: fix mkdefaults.py for non-*nix platforms
Introduced in 2f38d93
1 parent b042f1d commit 6b77769

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

tools/mkdefaults.py

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,21 @@
5858
if cfg.startswith(CFG_TARGET + '='):
5959
target_chip = cfg[len(CFG_TARGET) + 1:]
6060

61-
# Backup existing sdkconfig.default file
61+
# Backup/remove existing sdkconfig files
6262
if os.path.isfile('./sdkconfig.defaults'):
6363
os.rename('./sdkconfig.defaults', './sdkconfig.defaults.orig')
64+
if os.path.isfile('./sdkconfig'):
65+
os.remove('./sdkconfig')
66+
67+
subprocess.check_call(f'idf.py set-target {target_chip}', shell=True)
68+
69+
# Remove recreated sdkconfig files
70+
if os.path.isfile('./sdkconfig.defaults'):
71+
os.remove('./sdkconfig.defaults')
72+
if os.path.isfile('./sdkconfig'):
73+
os.remove('./sdkconfig')
6474

6575
# Process tempfile with 'idf.py reconfigure write-defconfig' to create new sdkconfig.defaults
66-
subprocess.check_call(f'idf.py set-target {target_chip} && rm -f sdkconfig sdkconfig.defaults',
67-
shell=True)
6876
subprocess.check_call(f'idf.py -D SDKCONFIG_DEFAULTS="{TEMPFILE}" reconfigure save-defconfig',
6977
shell=True)
7078

0 commit comments

Comments
 (0)