build: namespace the generated version.h - take 2#8502
build: namespace the generated version.h - take 2#8502ycsin wants to merge 1 commit intothesofproject:mainfrom
version.h - take 2#8502Conversation
Zephyr's build time generated `version.h` is now in the `zephyr` to provide proper namespace, update the includes of this module accordingly. See ZephyrProject upstream PR at: zephyrproject-rtos/zephyr#63973 Signed-off-by: Yong Cong Sin <ycsin@meta.com>
version.hversion.h - take 2
|
Can one of the admins verify this patch?
|
|
@ycsin So can you get the Zephyr thing merged by reopening zephyrproject-rtos#31 and use that in Zephyr west.yml, and when we update SOF to new Zephyr, we'll merged this PR as part of the west.yml update. I think that's what @marc-hb wanted , and this, too, is ok for me. If Zephyr maintainers ask, you can point to this comment. |
btian1
left a comment
There was a problem hiding this comment.
if (CONFIG_SOF_ZEPHYR_STRICT_HEADERS)
target_include_directories(SOF INTERFACE ${sof_top_dir}/zephyr/include)
else()
# include Zephyr before xtos to flag up any errors in SOF
target_include_directories(SOF INTERFACE ${sof_top_dir}/zephyr/include)
target_include_directories(SOF INTERFACE ${sof_top_dir}/xtos/include)
endif()
please check the include path for change header path.
since there are multiple errors in CI build.
|
I can see this is now targetting Zephyr 3.7.0 , so let's bum the SOF milestone target appropriately to 2.10. |
31 has been replaced by (nearly identical) zephyrproject-rtos#34, not sure why. Nevermind, let's just ignore 31 now. |
Zephyr's build time generated
version.his now in thezephyrto provide proper namespace, update the includes of this module accordingly.See ZephyrProject upstream PR at:
zephyrproject-rtos/zephyr#63973
Take 1: #8459