From 7e479ed2c9209b59bacda7c37834491752c5ba52 Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Mon, 9 Oct 2023 10:25:45 +0200 Subject: [PATCH] Adapt to new PSA Crypto repo name Patterns I looked for: grep -i "psa-crypto" grep -i "psa.*crypto.*repo" grep -i "psa.*crypto.*root" Signed-off-by: Ronald Cron --- scripts/framework_dev/build_tree.py | 4 ++-- scripts/framework_dev/psa_storage.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/framework_dev/build_tree.py b/scripts/framework_dev/build_tree.py index b48a27711..2e10c88e2 100644 --- a/scripts/framework_dev/build_tree.py +++ b/scripts/framework_dev/build_tree.py @@ -19,7 +19,7 @@ import os import inspect -def looks_like_psa_crypto_root(path: str) -> bool: +def looks_like_tf_psa_crypto_root(path: str) -> bool: """Whether the given directory looks like the root of the PSA Crypto source tree.""" return all(os.path.isdir(os.path.join(path, subdir)) for subdir in ['include', 'core', 'drivers', 'programs', 'tests']) @@ -30,7 +30,7 @@ def looks_like_mbedtls_root(path: str) -> bool: for subdir in ['include', 'library', 'programs', 'tests']) def looks_like_root(path: str) -> bool: - return looks_like_psa_crypto_root(path) or looks_like_mbedtls_root(path) + return looks_like_tf_psa_crypto_root(path) or looks_like_mbedtls_root(path) def check_repo_path(): """ diff --git a/scripts/framework_dev/psa_storage.py b/scripts/framework_dev/psa_storage.py index a2e4c74a4..737760fd4 100644 --- a/scripts/framework_dev/psa_storage.py +++ b/scripts/framework_dev/psa_storage.py @@ -53,7 +53,7 @@ class Expr: """Update `value_cache` for expressions registered in `unknown_values`.""" expressions = sorted(self.unknown_values) includes = ['include'] - if build_tree.looks_like_psa_crypto_root('.'): + if build_tree.looks_like_tf_psa_crypto_root('.'): includes.append('drivers/builtin/include') values = c_build_helper.get_c_expression_values( 'unsigned long', '%lu',