diff options
author | Tamas Ban <tamas.ban@arm.com> | 2020-09-21 10:41:51 +0100 |
---|---|---|
committer | Tamas Ban <tamas.ban@arm.com> | 2020-09-30 08:07:38 +0000 |
commit | 63f87caf61c1cf986e9d0308e555f49fa2dab42f (patch) | |
tree | ee8ee5e4b15717d233dbba941112e6f1f5b5ea7a | |
parent | 1975134115a6927df861b8c839e68457a6a224fe (diff) | |
download | trusted-firmware-m-63f87caf61c1cf986e9d0308e555f49fa2dab42f.tar.gz |
Build: Fix MCUboot git tag
To be able to properly fetch a version indicated by
a tag or a commit hash move the 'v' character from the
cmake file to the value of the MCUBOOT_VERSION variable.
Change-Id: Ied87384636805205f13b1e4735e564d63417dffb
Signed-off-by: Tamas Ban <tamas.ban@arm.com>
-rw-r--r-- | config/config_default.cmake | 2 | ||||
-rw-r--r-- | lib/ext/mcuboot/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/config_default.cmake b/config/config_default.cmake index 191fa2ad68..a5ca8cc515 100644 --- a/config/config_default.cmake +++ b/config/config_default.cmake @@ -125,7 +125,7 @@ set(TFM_TEST_REPO_PATH "DOWNLOAD" CACHE PATH "Path to TFM set(CMSIS_5_PATH "DOWNLOAD" CACHE PATH "Path to CMSIS_5 (or DOWNLOAD to fetch automatically") set(MCUBOOT_PATH "DOWNLOAD" CACHE PATH "Path to MCUboot (or DOWNLOAD to fetch automatically") -set(MCUBOOT_VERSION "1.6.0" CACHE STRING "The version of MCUboot to use") +set(MCUBOOT_VERSION "v1.6.0" CACHE STRING "The version of MCUboot to use") set(TFM_INTERNAL_MCUBOOT OFF CACHE BOOL "Use internal MCUboot files instead of upstream repo") set(PSA_ARCH_TESTS_PATH "DOWNLOAD" CACHE PATH "Path to PSA arch tests (or DOWNLOAD to fetch automatically") diff --git a/lib/ext/mcuboot/CMakeLists.txt b/lib/ext/mcuboot/CMakeLists.txt index 5fcdfd9d32..4c817cd64d 100644 --- a/lib/ext/mcuboot/CMakeLists.txt +++ b/lib/ext/mcuboot/CMakeLists.txt @@ -16,7 +16,7 @@ endif() if ("${MCUBOOT_PATH}" STREQUAL "DOWNLOAD") FetchContent_Declare(mcuboot GIT_REPOSITORY https://github.com/JuulLabs-OSS/mcuboot.git - GIT_TAG v${MCUBOOT_VERSION} + GIT_TAG ${MCUBOOT_VERSION} GIT_SHALLOW TRUE GIT_PROGRESS TRUE GIT_SUBMODULES "" |