commit 0e4d772c9957a847e9ebfb7e6d451ccec0c404f9
author Xinyu Zhang <xinyu.zhang@arm.com> Wed Oct 11 17:02:36 2023 +0800
committer Kevin Peng <kevin.peng@arm.com> Wed Oct 11 17:47:11 2023 +0800
tree 40f59c1f70dbe269886ab9f024eb588e30abe504
parent 83ef244e1201a07c023b6794296c1f888690f3a2

clone.sh: Rename parse_version to parse_version_from_cmake

Rename parse_version to parse_version_from_cmake to make the function
name more clear. This is to prepare for introducing dependency version
from TF-M commit message.

Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
Change-Id: Ib5b6d38ead6346ff5482f1e6baabf73ea185eff1

clone.sh

diff --git a/clone.sh b/clone.sh
index bf8b631..522eee7 100755
--- a/clone.sh
+++ b/clone.sh
@@ -45,7 +45,7 @@
 echo
 
 # Parse dependency version specified in TF-M CMake configs
-function parse_version() {
+function parse_version_from_cmake() {
     CONFIG_FILE_NAME=$1
     DEPENDENCY_NAME=$2
     CONFIG_FILE_PATH="${SHARE_FOLDER}/${TFM_NAME}/${CONFIG_FILE_NAME}"
@@ -102,15 +102,15 @@
 
 # Dependency projects
 TFM_TESTS_PROJECT="${TFM_TESTS_URL:-}"
-TFM_TESTS_REFSPEC="${TFM_TESTS_REFSPEC:-"$(parse_version lib/ext/tf-m-tests/repo_config_default.cmake TFM_TEST_REPO_VERSION)"}"
+TFM_TESTS_REFSPEC="${TFM_TESTS_REFSPEC:-"$(parse_version_from_cmake lib/ext/tf-m-tests/repo_config_default.cmake TFM_TEST_REPO_VERSION)"}"
 TFM_TESTS_NAME="tf-m-tests"
 
 MBEDTLS_PROJECT="${MBEDTLS_URL:-}"
-MBEDTLS_REFSPEC="${MBEDTLS_VERSION:-"$(parse_version config/config_base.cmake MBEDCRYPTO_VERSION)"}"
+MBEDTLS_REFSPEC="${MBEDTLS_VERSION:-"$(parse_version_from_cmake config/config_base.cmake MBEDCRYPTO_VERSION)"}"
 MBEDTLS_NAME="mbedtls"
 
 MCUBOOT_PROJECT="${MCUBOOT_URL:-}"
-MCUBOOT_REFSPEC="${MCUBOOT_REFSPEC:-"$(parse_version config/config_base.cmake MCUBOOT_VERSION)"}"
+MCUBOOT_REFSPEC="${MCUBOOT_REFSPEC:-"$(parse_version_from_cmake config/config_base.cmake MCUBOOT_VERSION)"}"
 MCUBOOT_NAME="mcuboot"
 
 PSA_ARCH_TESTS_PROJECT="${PSA_ARCH_TESTS_URL:-}"
@@ -118,11 +118,11 @@
 PSA_ARCH_TESTS_NAME="psa-arch-tests"
 
 QCBOR_PROJECT="${QCBOR_URL:-}"
-QCBOR_REFSPEC="${QCBOR_VERSION:-"$(parse_version lib/ext/qcbor/CMakeLists.txt QCBOR_VERSION)"}"
+QCBOR_REFSPEC="${QCBOR_VERSION:-"$(parse_version_from_cmake lib/ext/qcbor/CMakeLists.txt QCBOR_VERSION)"}"
 QCBOR_NAME="qcbor"
 
 TFM_EXTRAS_PROJECT="${TFM_EXTRAS_URL:-}"
-TFM_EXTRAS_REFSPEC="${TFM_EXTRAS_REFSPEC:-"$(parse_version lib/ext/tf-m-extras/CMakeLists.txt TFM_EXTRAS_REPO_VERSION)"}"
+TFM_EXTRAS_REFSPEC="${TFM_EXTRAS_REFSPEC:-"$(parse_version_from_cmake lib/ext/tf-m-extras/CMakeLists.txt TFM_EXTRAS_REPO_VERSION)"}"
 TFM_EXTRAS_NAME="tf-m-extras"
 
 QA_TOOLS_PROJECT="https://review.trustedfirmware.org/ci/qa-tools"