Skip to content

Commit 425c519

Browse files
authored
Arm backend: Make patch_repo quieter. (#18835)
Removes duplicate or un-interesting information. Signed-off-by: Erik Lundell <erik.lundell@arm.com>
1 parent 2eaa16c commit 425c519

2 files changed

Lines changed: 13 additions & 13 deletions

File tree

backends/arm/scripts/corstone_utils.cmake

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,32 +30,32 @@ function(fetch_ethos_u_content ETHOS_SDK_PATH ET_DIR_PATH)
3030
execute_process(
3131
COMMAND
3232
bash -c
33-
"pwd && source backends/arm/scripts/utils.sh && patch_repo ${ETHOS_SDK_PATH} ${ethos_u_base_rev} ${patch_dir}"
34-
WORKING_DIRECTORY ${ET_DIR_PATH} COMMAND_ECHO STDOUT
33+
"source backends/arm/scripts/utils.sh && patch_repo ${ETHOS_SDK_PATH} ${ethos_u_base_rev} ${patch_dir}"
34+
WORKING_DIRECTORY ${ET_DIR_PATH}
3535
)
3636
# Get ethos_u externals only if core_platform folder does not already exist.
3737
if(NOT EXISTS "${ETHOS_SDK_PATH}/core_platform")
3838
execute_process(
3939
COMMAND ${PYTHON_EXECUTABLE} fetch_externals.py -c
4040
${ethos_u_base_tag}.json fetch
41-
WORKING_DIRECTORY ${ETHOS_SDK_PATH} COMMAND_ECHO STDOUT
41+
WORKING_DIRECTORY ${ETHOS_SDK_PATH}
4242
)
4343
endif()
4444
# Patch core_software to remove unused projects.
4545
set(core_software_base_rev "26.02")
4646
execute_process(
4747
COMMAND
4848
bash -c
49-
"pwd && source backends/arm/scripts/utils.sh && patch_repo ${ETHOS_SDK_PATH}/core_software ${core_software_base_rev} ${patch_dir}"
50-
WORKING_DIRECTORY ${ET_DIR_PATH} COMMAND_ECHO STDOUT
49+
"source backends/arm/scripts/utils.sh && patch_repo ${ETHOS_SDK_PATH}/core_software ${core_software_base_rev} ${patch_dir}"
50+
WORKING_DIRECTORY ${ET_DIR_PATH}
5151
)
5252
# Always patch the core_platform repo since this is fast enough.
5353
set(core_platform_base_rev "26.02")
5454
execute_process(
5555
COMMAND
5656
bash -c
57-
"pwd && source backends/arm/scripts/utils.sh && patch_repo ${ETHOS_SDK_PATH}/core_platform ${core_platform_base_rev} ${patch_dir}"
58-
WORKING_DIRECTORY ${ET_DIR_PATH} COMMAND_ECHO STDOUT
57+
"source backends/arm/scripts/utils.sh && patch_repo ${ETHOS_SDK_PATH}/core_platform ${core_platform_base_rev} ${patch_dir}"
58+
WORKING_DIRECTORY ${ET_DIR_PATH}
5959
)
6060
endfunction()
6161

backends/arm/scripts/utils.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,16 @@ function patch_repo() {
8282
local name="$(basename $repo_dir)"
8383
local patch_dir="${3}/$name"
8484

85-
echo -e "[${FUNCNAME[0]}] Patching ${name} repo_dir:${repo_dir} base_rev:${base_rev} patch_dir:${patch_dir}"
86-
pushd $repo_dir
87-
git fetch
88-
git reset --hard ${base_rev}
85+
echo -e "[${FUNCNAME[0]}] Patching ${name}. repo_dir:${repo_dir}\t base_rev:${base_rev}\t patch_dir:${patch_dir}"
86+
pushd $repo_dir > /dev/null
87+
git fetch --quiet
88+
git reset --hard ${base_rev} --quiet
8989

9090
[[ -e ${patch_dir} && $(ls -A ${patch_dir}) ]] && \
9191
git am -3 ${patch_dir}/*.patch
9292

93-
echo -e "[${FUNCNAME[0]}] Patched ${name} @ $(git describe --all --long 2> /dev/null) in ${repo_dir} dir.\n"
94-
popd
93+
echo -e "[${FUNCNAME[0]}] Patched ${name} @ $(git describe --all --long 2> /dev/null) in ${repo_dir} dir."
94+
popd > /dev/null
9595
}
9696

9797
function check_platform_support() {

0 commit comments

Comments
 (0)