Merge pull request #9888 from valeriosetti/issue101-development

ronald-cron-arm · web-flow · commit 99d82166a33a · 2025-01-14T10:46:20.000Z
Move pkgconfig.sh to the framework
diff --git a/framework b/framework
@@ -1 +1 @@
-Subproject commit 71171b77f50302206cc87b93bc8bf76f16b6e1c4
+Subproject commit 57ee691a3e57f172a03c3f2f5c4da457e8fabf3c
diff --git a/tests/scripts/components-build-system.sh b/tests/scripts/components-build-system.sh
@@ -116,7 +116,7 @@ component_test_cmake_as_package () {
     ./cmake_package
     if [[ "$OSTYPE" == linux* ]]; then
         PKG_CONFIG_PATH="${build_variant_dir}/mbedtls/pkgconfig" \
-        ${root_dir}/tests/scripts/pkgconfig.sh \
+        ${root_dir}/framework/scripts/pkgconfig.sh \
         mbedtls mbedx509 mbedcrypto
         # These are the EXPECTED package names. Renaming these could break
         # consumers of pkg-config, consider carefully.
@@ -137,7 +137,7 @@ component_test_tf_psa_crypto_cmake_as_package () {
     ./cmake_package
     if [[ "$OSTYPE" == linux* ]]; then
         PKG_CONFIG_PATH="${build_variant_dir}/tf-psa-crypto/pkgconfig" \
-        ${root_dir}/tests/scripts/pkgconfig.sh \
+        ${root_dir}/framework/scripts/pkgconfig.sh \
         tfpsacrypto
         # This is the EXPECTED package name. Renaming it could break consumers
         # of pkg-config, consider carefully.
diff --git a/tests/scripts/pkgconfig.sh b/tests/scripts/pkgconfig.sh
