michaelh/zephyr
1
0
Fork 0
Code Releases Activity

west: runners: openocd: Fix version format regression

Browse source 
Change OpenOCD version regex to be compatible again with format strings
not having a space or newline immediately after the version nr.

Modified regex has been verified with the strings listed below.

Ubuntu:
"Open On-Chip Debugger 0.11.0"

ADI:
"Open On-Chip Debugger (Analog Devices 0.12.0-1.1.1)  OpenOCD 0.12.0 (2024-
08-27-17:25)"

Zephyr SDK:
"Open On-Chip Debugger 0.11.0+dev-00728-gb6f95a16c (2024-02-17-23:51)"

Infineon:
"Open On-Chip Debugger 0.12.0+dev-5.2.1.3248 (2024-08-08-17:29)"

Espressif:
"Open On-Chip Debugger v0.12.0-esp32-20240318 (2024-03-18-18:25)"

Fixes: 1c05f2121c

Signed-off-by: Hakan Jansson <hakan.jansson@infineon.com>
This commit is contained in:
Hakan Jansson 2025-03-27 14:41:32 +01:00 • committed by Benjamin Cabé
commit f107dad6e9
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -233,7 +233,7 @@ class OpenOcdBinaryRunner(ZephyrBinaryRunner):
stderr=subprocess.STDOUT).decode() stderr=subprocess.STDOUT).decode()
# Account for version info format of ADI fork of OpenOCD as well # Account for version info format of ADI fork of OpenOCD as well
version_match = re.search(r"Open On-Chip Debugger.* v?(\d+.\d+.\d+)[ \n]", out) version_match = re.search(r"Open On-Chip Debugger.* v?(\d+.\d+.\d+)", out)
version = version_match.group(1).split('.') version = version_match.group(1).split('.')
return [to_num(i) for i in version] return [to_num(i) for i in version]