adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

west: runners: add option 'v' prefix to OpenOCD version string

Browse source 
The Espressif branch of OpenOCD uses the version string "v0.12.0" instead
of "0.12.0" causing the version regex match to fail.

Add an optional 'v' prefix to avoid the failure.

Fixes: #83373
Signed-off-by: Eric Holmberg <eric.holmberg@northriversystems.co.nz>
This commit is contained in:
Eric Holmberg 2025-01-08 11:25:47 +13:00 committed by Benjamin Cabé
parent 7a189ae0fa
commit 3d42a1cfbc
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/west_commands/runners/openocd.py
View file

@ -222,7 +222,7 @@ class OpenOcdBinaryRunner(ZephyrBinaryRunner):
out = self.check_output([self.openocd_cmd[0], '--version'],
stderr=subprocess.STDOUT).decode()
version_match = re.search(r"Open On-Chip Debugger (\d+.\d+.\d+)", out)
version_match = re.search(r"Open On-Chip Debugger v?(\d+.\d+.\d+)", out)
version = version_match.group(1).split('.')
return [to_num(i) for i in version]