meta-zephyr-sdk: Get OpenOCD SRCREV from openocd submodule

stephanosio · stephanosio · commit 877f59425da2 · 2025-10-19T15:26:08.000+09:00
This commit updates the OpenOCD recipe to obtain the SRCREV from the
sdk-ng 'openocd' submodule.

Signed-off-by: Stephanos Ioannidis &lt;root@stephanos.io&gt;
diff --git a/meta-zephyr-sdk/recipes-hosttools/openocd/openocd_git.bb b/meta-zephyr-sdk/recipes-hosttools/openocd/openocd_git.bb
@@ -6,7 +6,7 @@ RDEPENDS_${PN} = "libusb1 hidapi"
 SRC_URI = " \
 	gitsm://github.com/zephyrproject-rtos/openocd.git;protocol=https;nobranch=1 \
 	"
-SRCREV = "662bf274f881afa0aec2c21040eedb91146d8c4a"
+SRCREV = "${ZEPHYR_SDK_OPENOCD_SRCREV}"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta-zephyr-sdk/scripts/meta-zephyr-sdk-build.sh b/meta-zephyr-sdk/scripts/meta-zephyr-sdk-build.sh
@@ -58,6 +58,9 @@ export BB_ENV_PASSTHROUGH_ADDITIONS="${BB_ENV_PASSTHROUGH_ADDITIONS} ZEPHYR_SDK_
 export ZEPHYR_SDK_QEMU_XILINX_SRCREV=$(cd qemu_xilinx; git rev-parse HEAD)
 export BB_ENV_PASSTHROUGH_ADDITIONS="${BB_ENV_PASSTHROUGH_ADDITIONS} ZEPHYR_SDK_QEMU_XILINX_SRCREV"
 
+export ZEPHYR_SDK_OPENOCD_SRCREV=$(cd openocd; git rev-parse HEAD)
+export BB_ENV_PASSTHROUGH_ADDITIONS="${BB_ENV_PASSTHROUGH_ADDITIONS} ZEPHYR_SDK_OPENOCD_SRCREV"
+
 # setconf_var, i.e. "MACHINE","qemuarm",$localconf
 setconf_var()
 {

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ RDEPENDS_${PN} = "libusb1 hidapi"`
`6`	`6`	`SRC_URI = " \`
`7`	`7`	`gitsm://github.com/zephyrproject-rtos/openocd.git;protocol=https;nobranch=1 \`
`8`	`8`	`"`
`9`		`-SRCREV = "662bf274f881afa0aec2c21040eedb91146d8c4a"`
	`9`	`+SRCREV = "${ZEPHYR_SDK_OPENOCD_SRCREV}"`
`10`	`10`
`11`	`11`	`S = "${WORKDIR}/git"`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,9 @@ export BB_ENV_PASSTHROUGH_ADDITIONS="${BB_ENV_PASSTHROUGH_ADDITIONS} ZEPHYR_SDK_`
`58`	`58`	`export ZEPHYR_SDK_QEMU_XILINX_SRCREV=$(cd qemu_xilinx; git rev-parse HEAD)`
`59`	`59`	`export BB_ENV_PASSTHROUGH_ADDITIONS="${BB_ENV_PASSTHROUGH_ADDITIONS} ZEPHYR_SDK_QEMU_XILINX_SRCREV"`
`60`	`60`
	`61`	`+export ZEPHYR_SDK_OPENOCD_SRCREV=$(cd openocd; git rev-parse HEAD)`
	`62`	`+export BB_ENV_PASSTHROUGH_ADDITIONS="${BB_ENV_PASSTHROUGH_ADDITIONS} ZEPHYR_SDK_OPENOCD_SRCREV"`
	`63`	`+`
`61`	`64`	`# setconf_var, i.e. "MACHINE","qemuarm",$localconf`
`62`	`65`	`setconf_var()`
`63`	`66`	`{`