mirror of
https://github.com/Mbed-TLS/mbedtls-framework.git
synced 2026-10-02 06:47:23 +00:00
Merge pull request #8327 from ronald-cron-arm/adapt-psa-crypto-repo-name
Adapt to new PSA Crypto repo name
This commit is contained in:
@@ -19,7 +19,7 @@
|
|||||||
import os
|
import os
|
||||||
import inspect
|
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."""
|
"""Whether the given directory looks like the root of the PSA Crypto source tree."""
|
||||||
return all(os.path.isdir(os.path.join(path, subdir))
|
return all(os.path.isdir(os.path.join(path, subdir))
|
||||||
for subdir in ['include', 'core', 'drivers', 'programs', 'tests'])
|
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'])
|
for subdir in ['include', 'library', 'programs', 'tests'])
|
||||||
|
|
||||||
def looks_like_root(path: str) -> bool:
|
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():
|
def check_repo_path():
|
||||||
"""
|
"""
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ class Expr:
|
|||||||
"""Update `value_cache` for expressions registered in `unknown_values`."""
|
"""Update `value_cache` for expressions registered in `unknown_values`."""
|
||||||
expressions = sorted(self.unknown_values)
|
expressions = sorted(self.unknown_values)
|
||||||
includes = ['include']
|
includes = ['include']
|
||||||
if build_tree.looks_like_psa_crypto_root('.'):
|
if build_tree.looks_like_tf_psa_crypto_root('.'):
|
||||||
includes.append('drivers/builtin/include')
|
includes.append('drivers/builtin/include')
|
||||||
values = c_build_helper.get_c_expression_values(
|
values = c_build_helper.get_c_expression_values(
|
||||||
'unsigned long', '%lu',
|
'unsigned long', '%lu',
|
||||||
|
|||||||
Reference in New Issue
Block a user