| Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 1 | From 7aa9796020487ce32746c25934ce20829acc462c Mon Sep 17 00:00:00 2001 |
| 2 | From: Julian Hall <julian.hall@arm.com> |
| 3 | Date: Fri, 11 Feb 2022 13:42:59 +0000 |
| 4 | Subject: [PATCH] Update refspecs for mbedtls and psa-arch-tests for v3.1.0 |
| 5 | |
| 6 | Updates external component refspecs to use mbedtls 3.1.0 and |
| 7 | compatible API tests from psa-arch-test. |
| 8 | |
| 9 | Signed-off-by: Julian Hall <julian.hall@arm.com> |
| 10 | Change-Id: I1b5cebd7de3c1885f5f8a8ea21ba5e4c52aefaf4 |
| 11 | |
| 12 | Upstream-Status: Pending [Not submitted to upstream yet] |
| 13 | Signed-off-by: Emekcan Aras <Emekcan.Aras@arm.com> |
| 14 | |
| 15 | |
| 16 | --- |
| 17 | external/MbedTLS/MbedTLS.cmake | 2 +- |
| 18 | external/psa_arch_tests/psa_arch_tests.cmake | 17 ++++++----------- |
| 19 | 2 files changed, 7 insertions(+), 12 deletions(-) |
| 20 | |
| 21 | diff --git a/external/MbedTLS/MbedTLS.cmake b/external/MbedTLS/MbedTLS.cmake |
| 22 | index 935be765..3350d8a0 100644 |
| 23 | --- a/external/MbedTLS/MbedTLS.cmake |
| 24 | +++ b/external/MbedTLS/MbedTLS.cmake |
| 25 | @@ -7,7 +7,7 @@ |
| 26 | |
| 27 | set(MBEDTLS_URL "https://github.com/ARMmbed/mbedtls.git" |
| 28 | CACHE STRING "Mbed TLS repository URL") |
| 29 | -set(MBEDTLS_REFSPEC "mbedtls-3.0.0" |
| 30 | +set(MBEDTLS_REFSPEC "mbedtls-3.1.0" |
| 31 | CACHE STRING "Mbed TLS git refspec") |
| 32 | set(MBEDTLS_SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/_deps/mbedtls-src" |
| 33 | CACHE PATH "MbedTLS source directory") |
| 34 | diff --git a/external/psa_arch_tests/psa_arch_tests.cmake b/external/psa_arch_tests/psa_arch_tests.cmake |
| 35 | index e6ab73f7..f6d2fb9f 100644 |
| 36 | --- a/external/psa_arch_tests/psa_arch_tests.cmake |
| 37 | +++ b/external/psa_arch_tests/psa_arch_tests.cmake |
| 38 | @@ -5,20 +5,15 @@ |
| 39 | # |
| 40 | #------------------------------------------------------------------------------- |
| 41 | |
| 42 | -# Determine the number of processes to run while running parallel builds. |
| 43 | -# Pass -DPROCESSOR_COUNT=<n> to cmake to override. |
| 44 | -if(NOT DEFINED PROCESSOR_COUNT) |
| 45 | - include(ProcessorCount) |
| 46 | - ProcessorCount(PROCESSOR_COUNT) |
| 47 | - set(PROCESSOR_COUNT ${PROCESSOR_COUNT} CACHE STRING "Number of cores to use for parallel builds.") |
| 48 | -endif() |
| 49 | +# Temporarily using modified tests used for tf-m verification |
| 50 | +set(PSA_ARCH_TESTS_URL "https://github.com/bensze01/psa-arch-tests.git" CACHE STRING "psa-arch-tests repository URL") |
| 51 | +set(PSA_ARCH_TESTS_REFSPEC "fix-multipart-aead" CACHE STRING "psa-arch-tests git refspec") |
| 52 | |
| 53 | -set(PSA_ARCH_TESTS_URL "https://github.com/ARM-software/psa-arch-tests.git" CACHE STRING "psa-arch-tests repository URL") |
| 54 | -set(PSA_ARCH_TESTS_REFSPEC "master" CACHE STRING "psa-arch-tests git refspec") |
| 55 | +#set(PSA_ARCH_TESTS_URL "https://github.com/ARM-software/psa-arch-tests.git" CACHE STRING "psa-arch-tests repository URL") |
| 56 | +#set(PSA_ARCH_TESTS_REFSPEC "2a1852252a9b9af655cbe02d5d3c930952d0d798" CACHE STRING "psa-arch-tests v22.01_API1.4_ADAC_BETA") |
| 57 | set(PSA_ARCH_TESTS_INSTALL_PATH "${CMAKE_CURRENT_BINARY_DIR}/psa-arch-tests_install" CACHE PATH "psa-arch-tests installation directory") |
| 58 | set(PSA_ARCH_TESTS_PACKAGE_PATH "${PSA_ARCH_TESTS_INSTALL_PATH}/libpsa-arch-tests/cmake" CACHE PATH "psa-arch-tests CMake package directory") |
| 59 | - |
| 60 | -include(FetchContent) |
| 61 | +set(PSA_ARCH_TESTS_SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/_deps/psa_arch_tests-src" CACHE PATH "psa-arch-tests source.") |
| 62 | |
| 63 | # Checking git |
| 64 | find_program(GIT_COMMAND "git") |