michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Revert "sysbuild: populate build_info with list of images"

Browse source 
This reverts commit f67939bf7e.
as it's part of a series of commits causing issues on Windows

Signed-off-by: Benjamin Cabé <benjamin@zephyrproject.org>
This commit is contained in:
Benjamin Cabé 2025-01-29 07:49:19 +01:00 • committed by Benjamin Cabé
commit 5b988356ec
1 changed files with 0 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

23
share/sysbuild/cmake/modules/sysbuild_images.cmake
View file

@ -5,26 +5,6 @@
# This module is responsible for including images into sysbuild and to call # This module is responsible for including images into sysbuild and to call
# pre and post hooks. # pre and post hooks.
# Internal function to update build info with list of images abnd write the file.
# Main reason for using an internal function is to properly scope variable usage.
# Function takes a list of images.
function(sysbuild_info_image images)
set(info_image_list)
foreach(image ${images})
ExternalProject_Get_Property(${image} SOURCE_DIR)
get_target_property(type ${image} APP_TYPE)
if(type)
list(APPEND info_image_list MAP "name: ${image}, source-dir: ${SOURCE_DIR}, type: ${type}")
else()
list(APPEND info_image_list MAP "name: ${image}, source-dir: ${source_dir}")
endif()
endforeach()
build_info(images VALUE ${info_image_list})
# Save current state of build info. This allow external tools to fetch sysbuild controlled images
# even in the event that one or more image fails configuration stage.
yaml_save(NAME build_info)
endfunction()
get_filename_component(APP_DIR ${APP_DIR} ABSOLUTE) get_filename_component(APP_DIR ${APP_DIR} ABSOLUTE)
get_filename_component(app_name ${APP_DIR} NAME) get_filename_component(app_name ${APP_DIR} NAME)
set(DEFAULT_IMAGE "${app_name}") set(DEFAULT_IMAGE "${app_name}")
@ -35,9 +15,6 @@ sysbuild_add_subdirectory(${sysbuild_toplevel_SOURCE_DIR}/images sysbuild/images
get_property(IMAGES GLOBAL PROPERTY sysbuild_images) get_property(IMAGES GLOBAL PROPERTY sysbuild_images)
sysbuild_module_call(PRE_CMAKE MODULES ${SYSBUILD_MODULE_NAMES} IMAGES ${IMAGES}) sysbuild_module_call(PRE_CMAKE MODULES ${SYSBUILD_MODULE_NAMES} IMAGES ${IMAGES})
sysbuild_images_order(IMAGES_CONFIGURATION_ORDER CONFIGURE IMAGES ${IMAGES}) sysbuild_images_order(IMAGES_CONFIGURATION_ORDER CONFIGURE IMAGES ${IMAGES})
sysbuild_info_image("${IMAGES}")
foreach(image ${IMAGES_CONFIGURATION_ORDER}) foreach(image ${IMAGES_CONFIGURATION_ORDER})
sysbuild_module_call(PRE_IMAGE_CMAKE MODULES ${SYSBUILD_MODULE_NAMES} IMAGES ${IMAGES} IMAGE ${image}) sysbuild_module_call(PRE_IMAGE_CMAKE MODULES ${SYSBUILD_MODULE_NAMES} IMAGES ${IMAGES} IMAGE ${image})
ExternalZephyrProject_Cmake(APPLICATION ${image}) ExternalZephyrProject_Cmake(APPLICATION ${image})