From f67a93602b823b84b7cecceab918653567aed68e Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Thu, 31 Jul 2025 16:46:58 +0200 Subject: [PATCH 1/4] Clean $OUT_OF_SOURCE_DIR in mbedtls too Signed-off-by: Gilles Peskine --- scripts/all-core.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/all-core.sh b/scripts/all-core.sh index 36776a24c..0677fdfb8 100644 --- a/scripts/all-core.sh +++ b/scripts/all-core.sh @@ -405,9 +405,7 @@ cleanup() rm -f programs/test/cmake_package_install/cmake_package_install # Remove out of source directory - if in_tf_psa_crypto_repo; then - rm -rf "$OUT_OF_SOURCE_DIR" - fi + rm -rf "$OUT_OF_SOURCE_DIR" # Restore files that may have been clobbered by the job restore_backed_up_files From 7f8faed25f89842f92c29ba134eef32d3d111a34 Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Thu, 31 Jul 2025 16:53:23 +0200 Subject: [PATCH 2/4] Fix make_generated_files.py --root The `--root` option was mostly ineffective since you could only use if the current directory was some other mbedtls or TF-PSA-Crypto root. Signed-off-by: Gilles Peskine --- scripts/make_generated_files.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/make_generated_files.py b/scripts/make_generated_files.py index 1ca0f2da7..72f2da289 100755 --- a/scripts/make_generated_files.py +++ b/scripts/make_generated_files.py @@ -10,6 +10,7 @@ """ import argparse import filecmp +import os import shutil import subprocess import sys @@ -235,6 +236,9 @@ def main(): args = parser.parse_args() + if args.root: + os.chdir(args.root) + if not build_tree.looks_like_root("."): raise RuntimeError("This script must be run from Mbed TLS or TF-PSA-Crypto root.") @@ -250,7 +254,7 @@ def main(): for file in files: print(str(file)) elif args.check: - check_generated_files(generation_scripts, Path(args.root or ".")) + check_generated_files(generation_scripts, Path(".")) else: make_generated_files(generation_scripts) From 7e45c38ad4c2deed0db15eefd3d0b6eab5b88e69 Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Thu, 31 Jul 2025 16:54:12 +0200 Subject: [PATCH 3/4] Let make_generated_files.py work in 3.6 too Just call `make generated_files`. `--list` won't work yet, because 3.6 currently lacks a way to list the generated files. We'll need to add support for `make list_generated_files`. Signed-off-by: Gilles Peskine --- scripts/make_generated_files.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/scripts/make_generated_files.py b/scripts/make_generated_files.py index 72f2da289..5dbc92ea8 100755 --- a/scripts/make_generated_files.py +++ b/scripts/make_generated_files.py @@ -242,12 +242,17 @@ def main(): if not build_tree.looks_like_root("."): raise RuntimeError("This script must be run from Mbed TLS or TF-PSA-Crypto root.") + if build_tree.is_mbedtls_3_6(): + if args.list: + subprocess.check_call(['make', 'list_generated_files']) + else: + subprocess.check_call(['make', 'generated_files']) + return + if build_tree.looks_like_tf_psa_crypto_root("."): generation_scripts = TF_PSA_CRYPTO_GENERATION_SCRIPTS - elif not build_tree.is_mbedtls_3_6(): - generation_scripts = MBEDTLS_GENERATION_SCRIPTS else: - raise Exception("No support for Mbed TLS 3.6") + generation_scripts = MBEDTLS_GENERATION_SCRIPTS if args.list: files = get_generated_files(generation_scripts) From 8cce847fb55c921dfc104e94d29cc585d8247e08 Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Thu, 31 Jul 2025 17:08:24 +0200 Subject: [PATCH 4/4] Don't silence "make list_generated_files" Signed-off-by: Gilles Peskine --- scripts/quiet/make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/quiet/make b/scripts/quiet/make index 920e5b875..ae95dbd20 100755 --- a/scripts/quiet/make +++ b/scripts/quiet/make @@ -12,7 +12,7 @@ # export VERBOSE_LOGS=1 # don't silence invocations containing these arguments -NO_SILENCE=" --version | test " +NO_SILENCE=" --version | list_generated_files | test " TOOL="make"