Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions backends/arm/scripts/corstone_utils.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -30,32 +30,32 @@ 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.
set(core_software_base_rev "26.02")
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()

Expand Down
12 changes: 6 additions & 6 deletions backends/arm/scripts/utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Loading