From 76fe5edd98fd37c9002cdd6a6f6c6a0d0ec55cca Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Mon, 10 Nov 2025 20:17:25 +0100 Subject: [PATCH] Use scripts/generate_config_checks.py unconditionally `scripts/generate_config_checks.py` had to be included conditionally so that consuming branches could transition from it not existing to it existing. Now that both TF-PSA-Crypto/development and mbedtls/development have this script, include it unconditionally. Signed-off-by: Gilles Peskine --- scripts/make_generated_files.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/scripts/make_generated_files.py b/scripts/make_generated_files.py index a2d04d355..73570fb28 100755 --- a/scripts/make_generated_files.py +++ b/scripts/make_generated_files.py @@ -10,7 +10,6 @@ Generate the TF-PSA-Crypto generated files """ import argparse import filecmp -import os import shutil import subprocess import sys @@ -75,17 +74,12 @@ def get_generation_script_files(generation_script: str): return files COMMON_GENERATION_SCRIPTS = [ -] - -# Once the script has been added to both Mbed TLS and TF-PSA-Crypto, -# we can include this unconditionally. -# https://github.com/Mbed-TLS/mbedtls/issues/10305 -if os.path.exists("scripts/generate_config_checks.py"): - COMMON_GENERATION_SCRIPTS.append(GenerationScript( + GenerationScript( Path("scripts/generate_config_checks.py"), get_generation_script_files("scripts/generate_config_checks.py"), output_dir_option="", - optional=True)) + optional=True) +] if build_tree.looks_like_tf_psa_crypto_root("."): TF_PSA_CRYPTO_GENERATION_SCRIPTS = [