From 6408113fe2f11d8ed3a35ee721761d9c8ab54da6 Mon Sep 17 00:00:00 2001 From: Valerio Setti Date: Tue, 25 Feb 2025 10:33:58 +0100 Subject: [PATCH 1/2] tests: move component_test_tf_psa_crypto_cmake_as_package to tf-psa-crypto Signed-off-by: Valerio Setti --- tests/scripts/components-build-system.sh | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/tests/scripts/components-build-system.sh b/tests/scripts/components-build-system.sh index 91a999e10a..3108aa7b92 100644 --- a/tests/scripts/components-build-system.sh +++ b/tests/scripts/components-build-system.sh @@ -123,27 +123,6 @@ component_test_cmake_as_package () { fi } -component_test_tf_psa_crypto_cmake_as_package () { - # Remove existing generated files so that we use the ones CMake - # generates - make neat - - msg "build: cmake 'as-package' build" - root_dir="$(pwd)" - cd tf-psa-crypto/programs/test/cmake_package - build_variant_dir="$(pwd)" - cmake . - make - ./cmake_package - if [[ "$OSTYPE" == linux* ]]; then - PKG_CONFIG_PATH="${build_variant_dir}/tf-psa-crypto/pkgconfig" \ - ${root_dir}/framework/scripts/pkgconfig.sh \ - tfpsacrypto - # This is the EXPECTED package name. Renaming it could break consumers - # of pkg-config, consider carefully. - fi -} - support_test_cmake_as_package () { support_test_cmake_out_of_source } From 5e838bd0e8a3f432dc2d7b7efe03eeb99518a874 Mon Sep 17 00:00:00 2001 From: Valerio Setti Date: Tue, 25 Feb 2025 14:37:33 +0100 Subject: [PATCH 2/2] tf-psa-crypto: update reference Signed-off-by: Valerio Setti --- tf-psa-crypto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tf-psa-crypto b/tf-psa-crypto index 7d60bf1078..7d941e84a5 160000 --- a/tf-psa-crypto +++ b/tf-psa-crypto @@ -1 +1 @@ -Subproject commit 7d60bf1078578bfc809f1516c195c54cefdb510d +Subproject commit 7d941e84a5b5c77f642186075ef45b3cc3214d57