From 3533e9b7611ff9573bbce98b8bd0a8e3c594ba5d Mon Sep 17 00:00:00 2001 From: Valerio Setti Date: Thu, 9 Jan 2025 14:21:30 +0100 Subject: [PATCH 1/3] Move files out of Mbed TLS The following files are moved to the framework repo (deleted here): tests/scripts/pkgconfig.sh Signed-off-by: Valerio Setti --- tests/scripts/pkgconfig.sh | 40 -------------------------------------- 1 file changed, 40 deletions(-) delete mode 100755 tests/scripts/pkgconfig.sh diff --git a/tests/scripts/pkgconfig.sh b/tests/scripts/pkgconfig.sh deleted file mode 100755 index 07a73b3dae..0000000000 --- a/tests/scripts/pkgconfig.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# -# Copyright The Mbed TLS Contributors -# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later -# -# Purpose -# -# Test pkgconfig files. -# -# For each of the build pkg-config files, .pc files, check that -# they validate and do some basic sanity testing on the output, -# i.e. that the strings are non-empty. -# -# NOTE: This requires the built pc files to be on the pkg-config -# search path, this can be controlled with env variable -# PKG_CONFIG_PATH. See man(1) pkg-config for details. -# - -set -e -u - -if [ $# -le 0 ] -then - echo " [!] No package names specified" >&2 - echo "Usage: $0 ..." >&2 - exit 1 -fi - -for pc in "$@"; do - printf "testing package config file: ${pc} ... " - pkg-config --validate "${pc}" - version="$(pkg-config --modversion "${pc}")" - test -n "$version" - cflags="$(pkg-config --cflags "${pc}")" - test -n "$cflags" - libs="$(pkg-config --libs "${pc}")" - test -n "$libs" - printf "passed\n" -done - -exit 0 From ba8500b6b97d1c36ad4cb05ef51143b4989d8a9c Mon Sep 17 00:00:00 2001 From: Valerio Setti Date: Thu, 9 Jan 2025 14:27:42 +0100 Subject: [PATCH 2/3] components-build-system.sh: fix path of pkgconfig.sh The script was moved to the framework sub-repo. Signed-off-by: Valerio Setti --- tests/scripts/components-build-system.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/scripts/components-build-system.sh b/tests/scripts/components-build-system.sh index f3a8d19758..d6ad88ab82 100644 --- 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. From dff650eb347680ab1e4bfa2094ec663079c0bfce Mon Sep 17 00:00:00 2001 From: Valerio Setti Date: Thu, 9 Jan 2025 14:28:19 +0100 Subject: [PATCH 3/3] framework: update reference Signed-off-by: Valerio Setti --- framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework b/framework index 71171b77f5..57ee691a3e 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 71171b77f50302206cc87b93bc8bf76f16b6e1c4 +Subproject commit 57ee691a3e57f172a03c3f2f5c4da457e8fabf3c