Merge pull request #10010 from valeriosetti/issue137-development

[development] Add components to components-build-system.sh
diff --git a/tests/scripts/components-build-system.sh b/tests/scripts/components-build-system.sh
index 91a999e..3108aa7 100644
--- a/tests/scripts/components-build-system.sh
+++ b/tests/scripts/components-build-system.sh
@@ -123,27 +123,6 @@
     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
 }
diff --git a/tf-psa-crypto b/tf-psa-crypto
index 7d60bf1..7d941e8 160000
--- a/tf-psa-crypto
+++ b/tf-psa-crypto
@@ -1 +1 @@
-Subproject commit 7d60bf1078578bfc809f1516c195c54cefdb510d
+Subproject commit 7d941e84a5b5c77f642186075ef45b3cc3214d57