| From 7aa9796020487ce32746c25934ce20829acc462c Mon Sep 17 00:00:00 2001 |
| From: Julian Hall <julian.hall@arm.com> |
| Date: Fri, 11 Feb 2022 13:42:59 +0000 |
| Subject: [PATCH] Update refspecs for mbedtls and psa-arch-tests for v3.1.0 |
| |
| Updates external component refspecs to use mbedtls 3.1.0 and |
| compatible API tests from psa-arch-test. |
| |
| Signed-off-by: Julian Hall <julian.hall@arm.com> |
| Change-Id: I1b5cebd7de3c1885f5f8a8ea21ba5e4c52aefaf4 |
| |
| Upstream-Status: Pending [Not submitted to upstream yet] |
| Signed-off-by: Emekcan Aras <Emekcan.Aras@arm.com> |
| |
| |
| --- |
| external/MbedTLS/MbedTLS.cmake | 2 +- |
| external/psa_arch_tests/psa_arch_tests.cmake | 17 ++++++----------- |
| 2 files changed, 7 insertions(+), 12 deletions(-) |
| |
| diff --git a/external/MbedTLS/MbedTLS.cmake b/external/MbedTLS/MbedTLS.cmake |
| index 935be765..3350d8a0 100644 |
| --- a/external/MbedTLS/MbedTLS.cmake |
| +++ b/external/MbedTLS/MbedTLS.cmake |
| @@ -7,7 +7,7 @@ |
| |
| set(MBEDTLS_URL "https://github.com/ARMmbed/mbedtls.git" |
| CACHE STRING "Mbed TLS repository URL") |
| -set(MBEDTLS_REFSPEC "mbedtls-3.0.0" |
| +set(MBEDTLS_REFSPEC "mbedtls-3.1.0" |
| CACHE STRING "Mbed TLS git refspec") |
| set(MBEDTLS_SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/_deps/mbedtls-src" |
| CACHE PATH "MbedTLS source directory") |
| diff --git a/external/psa_arch_tests/psa_arch_tests.cmake b/external/psa_arch_tests/psa_arch_tests.cmake |
| index e6ab73f7..f6d2fb9f 100644 |
| --- a/external/psa_arch_tests/psa_arch_tests.cmake |
| +++ b/external/psa_arch_tests/psa_arch_tests.cmake |
| @@ -5,20 +5,15 @@ |
| # |
| #------------------------------------------------------------------------------- |
| |
| -# Determine the number of processes to run while running parallel builds. |
| -# Pass -DPROCESSOR_COUNT=<n> to cmake to override. |
| -if(NOT DEFINED PROCESSOR_COUNT) |
| - include(ProcessorCount) |
| - ProcessorCount(PROCESSOR_COUNT) |
| - set(PROCESSOR_COUNT ${PROCESSOR_COUNT} CACHE STRING "Number of cores to use for parallel builds.") |
| -endif() |
| +# Temporarily using modified tests used for tf-m verification |
| +set(PSA_ARCH_TESTS_URL "https://github.com/bensze01/psa-arch-tests.git" CACHE STRING "psa-arch-tests repository URL") |
| +set(PSA_ARCH_TESTS_REFSPEC "fix-multipart-aead" CACHE STRING "psa-arch-tests git refspec") |
| |
| -set(PSA_ARCH_TESTS_URL "https://github.com/ARM-software/psa-arch-tests.git" CACHE STRING "psa-arch-tests repository URL") |
| -set(PSA_ARCH_TESTS_REFSPEC "master" CACHE STRING "psa-arch-tests git refspec") |
| +#set(PSA_ARCH_TESTS_URL "https://github.com/ARM-software/psa-arch-tests.git" CACHE STRING "psa-arch-tests repository URL") |
| +#set(PSA_ARCH_TESTS_REFSPEC "2a1852252a9b9af655cbe02d5d3c930952d0d798" CACHE STRING "psa-arch-tests v22.01_API1.4_ADAC_BETA") |
| set(PSA_ARCH_TESTS_INSTALL_PATH "${CMAKE_CURRENT_BINARY_DIR}/psa-arch-tests_install" CACHE PATH "psa-arch-tests installation directory") |
| set(PSA_ARCH_TESTS_PACKAGE_PATH "${PSA_ARCH_TESTS_INSTALL_PATH}/libpsa-arch-tests/cmake" CACHE PATH "psa-arch-tests CMake package directory") |
| - |
| -include(FetchContent) |
| +set(PSA_ARCH_TESTS_SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/_deps/psa_arch_tests-src" CACHE PATH "psa-arch-tests source.") |
| |
| # Checking git |
| find_program(GIT_COMMAND "git") |