Skip to content

sysbuild: fix extra kconfig targets when using sysbuild #77974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 16, 2024
Merged

sysbuild: fix extra kconfig targets when using sysbuild #77974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions share/sysbuild/cmake/modules/sysbuild_extensions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ function(ExternalZephyrProject_Add)
menuconfig
hardenconfig
guiconfig
${EXTRA_KCONFIG_TARGETS}
$CACHE{EXTRA_KCONFIG_TARGETS}
)

if(NOT ZBUILD_APP_TYPE STREQUAL "MAIN")
Expand All @@ -345,16 +345,28 @@ function(ExternalZephyrProject_Add)
USES_TERMINAL
)
endforeach()

set(list_separator ",")
set(image_extra_kconfig_targets "-DEXTRA_KCONFIG_TARGETS=$CACHE{EXTRA_KCONFIG_TARGETS}")
string(REPLACE ";" "${list_separator}" image_extra_kconfig_targets "${image_extra_kconfig_targets}")
foreach(target $CACHE{EXTRA_KCONFIG_TARGETS})
list(APPEND image_extra_kconfig_targets
-DEXTRA_KCONFIG_TARGET_COMMAND_FOR_${target}=$CACHE{EXTRA_KCONFIG_TARGET_COMMAND_FOR_${target}}
)
endforeach()

include(ExternalProject)
set(application_binary_dir ${CMAKE_BINARY_DIR}/${ZBUILD_APPLICATION})
ExternalProject_Add(
${ZBUILD_APPLICATION}
SOURCE_DIR ${ZBUILD_SOURCE_DIR}
BINARY_DIR ${application_binary_dir}
CONFIGURE_COMMAND ""
LIST_SEPARATOR "${list_separator}"
CMAKE_ARGS -DSYSBUILD:BOOL=True
-DSYSBUILD_CACHE:FILEPATH=${sysbuild_cache_file}
${shared_cmake_vars_argument}
${image_extra_kconfig_targets}
BUILD_COMMAND ${CMAKE_COMMAND} --build .
INSTALL_COMMAND ""
BUILD_ALWAYS True
Expand Down Expand Up @@ -453,7 +465,7 @@ function(ExternalZephyrProject_Cmake)
" ${image_banner_header}\n"
)

ExternalProject_Get_Property(${ZCMAKE_APPLICATION} SOURCE_DIR BINARY_DIR CMAKE_ARGS)
ExternalProject_Get_Property(${ZCMAKE_APPLICATION} SOURCE_DIR BINARY_DIR CMAKE_ARGS LIST_SEPARATOR)
get_target_property(${ZCMAKE_APPLICATION}_BOARD ${ZCMAKE_APPLICATION} BOARD)

get_property(${ZCMAKE_APPLICATION}_CONF_SCRIPT TARGET ${ZCMAKE_APPLICATION}
Expand All @@ -471,6 +483,7 @@ function(ExternalZephyrProject_Cmake)
string(CONFIGURE "${config_content}" config_content)
file(WRITE ${dotconfigsysbuild} ${config_content})

string(REPLACE "${LIST_SEPARATOR}" "\\;" CMAKE_ARGS "${CMAKE_ARGS}")
execute_process(
COMMAND ${CMAKE_COMMAND}
-G${CMAKE_GENERATOR}
Expand Down
5 changes: 5 additions & 0 deletions share/sysbuild/cmake/modules/sysbuild_kconfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ set(EXTRA_KCONFIG_TARGET_COMMAND_FOR_sysbuild_guiconfig
)

set(KCONFIG_TARGETS sysbuild_menuconfig sysbuild_guiconfig)
foreach(extra_target ${EXTRA_KCONFIG_TARGETS})
set(EXTRA_KCONFIG_TARGET_COMMAND_FOR_sysbuild_${extra_target}
"${EXTRA_KCONFIG_TARGET_COMMAND_FOR_${extra_target}}"
)
endforeach()
list(TRANSFORM EXTRA_KCONFIG_TARGETS PREPEND "sysbuild_")

zephyr_get(APPLICATION_CONFIG_DIR)
Expand Down