From 5b988356ec0c49bacb320b45d1990ea8e4382b40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Cab=C3=A9?= Date: Wed, 29 Jan 2025 07:49:19 +0100 Subject: [PATCH] Revert "sysbuild: populate build_info with list of images" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit f67939bf7e19703fd8b9373bcbf01a9e051c95e1. as it's part of a series of commits causing issues on Windows Signed-off-by: Benjamin Cabé --- .../cmake/modules/sysbuild_images.cmake | 23 ------------------- 1 file changed, 23 deletions(-) diff --git a/share/sysbuild/cmake/modules/sysbuild_images.cmake b/share/sysbuild/cmake/modules/sysbuild_images.cmake index 7115567b8d9..eb73ec99448 100644 --- a/share/sysbuild/cmake/modules/sysbuild_images.cmake +++ b/share/sysbuild/cmake/modules/sysbuild_images.cmake @@ -5,26 +5,6 @@ # This module is responsible for including images into sysbuild and to call # 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_name ${APP_DIR} 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) sysbuild_module_call(PRE_CMAKE MODULES ${SYSBUILD_MODULE_NAMES} IMAGES ${IMAGES}) sysbuild_images_order(IMAGES_CONFIGURATION_ORDER CONFIGURE IMAGES ${IMAGES}) - -sysbuild_info_image("${IMAGES}") - foreach(image ${IMAGES_CONFIGURATION_ORDER}) sysbuild_module_call(PRE_IMAGE_CMAKE MODULES ${SYSBUILD_MODULE_NAMES} IMAGES ${IMAGES} IMAGE ${image}) ExternalZephyrProject_Cmake(APPLICATION ${image})