From 167b329e030af132200681d2258fd8b61ce83123 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 | 37 ------------------------------------- 1 file changed, 37 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 2702bfa134e8..000000000000 --- a/tests/scripts/pkgconfig.sh +++ /dev/null @@ -1,37 +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 - -# These are the EXPECTED package names. Renaming these could break -# consumers of pkg-config, consider carefully. -all_pcs="mbedtls mbedx509 mbedcrypto" - -for pc in $all_pcs; 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 bb71bb568b9e7ff962078a2c4a77016d978a626a Mon Sep 17 00:00:00 2001 From: Valerio Setti Date: Thu, 9 Jan 2025 14:40:53 +0100 Subject: [PATCH 2/3] components-build-system.sh: align component_test_cmake_as_package Align component_test_cmake_as_package to the "development" branch version. Signed-off-by: Valerio Setti --- tests/scripts/components-build-system.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/scripts/components-build-system.sh b/tests/scripts/components-build-system.sh index 0db7885e0d85..a6da8e66a385 100644 --- a/tests/scripts/components-build-system.sh +++ b/tests/scripts/components-build-system.sh @@ -115,7 +115,11 @@ component_test_cmake_as_package () { make ./cmake_package if [[ "$OSTYPE" == linux* ]]; then - PKG_CONFIG_PATH="${build_variant_dir}/mbedtls/pkgconfig" ${root_dir}/tests/scripts/pkgconfig.sh + PKG_CONFIG_PATH="${build_variant_dir}/mbedtls/pkgconfig" \ + ${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. fi } @@ -212,4 +216,3 @@ component_build_cmake_programs_no_testing () { support_build_cmake_programs_no_testing () { support_test_cmake_out_of_source } - From 03b42ad0289cc6fe9b77f9cb63ffbf929f5078f9 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 71171b77f503..57ee691a3e57 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 71171b77f50302206cc87b93bc8bf76f16b6e1c4 +Subproject commit 57ee691a3e57f172a03c3f2f5c4da457e8fabf3c