From 2eece5bfd23c4c6f8e0a6c658b8c35b85cd2194e Mon Sep 17 00:00:00 2001 From: Erik Lundell Date: Tue, 7 Apr 2026 16:43:38 +0200 Subject: [PATCH] Arm backend: Make patch_repo quieter. Signed-off-by: Erik Lundell Change-Id: Ieb5a55cd05d63a31cbdf77fa5760ca8aa2dc8786 --- backends/arm/scripts/corstone_utils.cmake | 14 +++++++------- backends/arm/scripts/utils.sh | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/backends/arm/scripts/corstone_utils.cmake b/backends/arm/scripts/corstone_utils.cmake index eb13df313ae..bdfc3aeb007 100644 --- a/backends/arm/scripts/corstone_utils.cmake +++ b/backends/arm/scripts/corstone_utils.cmake @@ -30,15 +30,15 @@ function(fetch_ethos_u_content ETHOS_SDK_PATH ET_DIR_PATH) execute_process( COMMAND bash -c - "pwd && source backends/arm/scripts/utils.sh && patch_repo ${ETHOS_SDK_PATH} ${ethos_u_base_rev} ${patch_dir}" - WORKING_DIRECTORY ${ET_DIR_PATH} COMMAND_ECHO STDOUT + "source backends/arm/scripts/utils.sh && patch_repo ${ETHOS_SDK_PATH} ${ethos_u_base_rev} ${patch_dir}" + WORKING_DIRECTORY ${ET_DIR_PATH} ) # Get ethos_u externals only if core_platform folder does not already exist. if(NOT EXISTS "${ETHOS_SDK_PATH}/core_platform") execute_process( COMMAND ${PYTHON_EXECUTABLE} fetch_externals.py -c ${ethos_u_base_tag}.json fetch - WORKING_DIRECTORY ${ETHOS_SDK_PATH} COMMAND_ECHO STDOUT + WORKING_DIRECTORY ${ETHOS_SDK_PATH} ) endif() # Patch core_software to remove unused projects. @@ -46,16 +46,16 @@ function(fetch_ethos_u_content ETHOS_SDK_PATH ET_DIR_PATH) execute_process( COMMAND bash -c - "pwd && source backends/arm/scripts/utils.sh && patch_repo ${ETHOS_SDK_PATH}/core_software ${core_software_base_rev} ${patch_dir}" - WORKING_DIRECTORY ${ET_DIR_PATH} COMMAND_ECHO STDOUT + "source backends/arm/scripts/utils.sh && patch_repo ${ETHOS_SDK_PATH}/core_software ${core_software_base_rev} ${patch_dir}" + WORKING_DIRECTORY ${ET_DIR_PATH} ) # Always patch the core_platform repo since this is fast enough. set(core_platform_base_rev "26.02") execute_process( COMMAND bash -c - "pwd && source backends/arm/scripts/utils.sh && patch_repo ${ETHOS_SDK_PATH}/core_platform ${core_platform_base_rev} ${patch_dir}" - WORKING_DIRECTORY ${ET_DIR_PATH} COMMAND_ECHO STDOUT + "source backends/arm/scripts/utils.sh && patch_repo ${ETHOS_SDK_PATH}/core_platform ${core_platform_base_rev} ${patch_dir}" + WORKING_DIRECTORY ${ET_DIR_PATH} ) endfunction() diff --git a/backends/arm/scripts/utils.sh b/backends/arm/scripts/utils.sh index d69dbea7609..2253311a19f 100644 --- a/backends/arm/scripts/utils.sh +++ b/backends/arm/scripts/utils.sh @@ -82,16 +82,16 @@ function patch_repo() { local name="$(basename $repo_dir)" local patch_dir="${3}/$name" - echo -e "[${FUNCNAME[0]}] Patching ${name} repo_dir:${repo_dir} base_rev:${base_rev} patch_dir:${patch_dir}" - pushd $repo_dir - git fetch - git reset --hard ${base_rev} + echo -e "[${FUNCNAME[0]}] Patching ${name}. repo_dir:${repo_dir}\t base_rev:${base_rev}\t patch_dir:${patch_dir}" + pushd $repo_dir > /dev/null + git fetch --quiet + git reset --hard ${base_rev} --quiet [[ -e ${patch_dir} && $(ls -A ${patch_dir}) ]] && \ git am -3 ${patch_dir}/*.patch - echo -e "[${FUNCNAME[0]}] Patched ${name} @ $(git describe --all --long 2> /dev/null) in ${repo_dir} dir.\n" - popd + echo -e "[${FUNCNAME[0]}] Patched ${name} @ $(git describe --all --long 2> /dev/null) in ${repo_dir} dir." + popd > /dev/null } function check_platform_support() {