Mbed-TLS/mbedtls-framework
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls-framework.git synced 2026-09-09 03:39:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #77 from Harry-Ramsey/tf-psa-crypto-out-of-source-development

Browse Source 
Add out of source build functions for TF-PSA-Crypto
This commit is contained in:
Ronald Cron
2025-01-06 15:13:55 +01:00
committed by GitHub
parent 9e0557f290 f3044f8d98
commit 81dfe001e1
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/all-core.sh
+19 -1
View File
@@ -165,6 +165,8 @@ pre_initialize_variables () {
PSA_CORE_PATH='tf-psa-crypto/core' PSA_CORE_PATH='tf-psa-crypto/core'
BUILTIN_SRC_PATH='tf-psa-crypto/drivers/builtin/src' BUILTIN_SRC_PATH='tf-psa-crypto/drivers/builtin/src'
CONFIG_TEST_DRIVER_H='tf-psa-crypto/tests/configs/crypto_config_test_driver.h' CONFIG_TEST_DRIVER_H='tf-psa-crypto/tests/configs/crypto_config_test_driver.h'
MBEDTLS_ROOT_DIR="$PWD"
TF_PSA_CRYPTO_ROOT_DIR="$PWD/tf-psa-crypto"
fi fi
config_files="$CONFIG_H $CRYPTO_CONFIG_H $CONFIG_TEST_DRIVER_H" config_files="$CONFIG_H $CRYPTO_CONFIG_H $CONFIG_TEST_DRIVER_H"
else else
@@ -172,6 +174,8 @@ pre_initialize_variables () {
PSA_CORE_PATH='core' PSA_CORE_PATH='core'
BUILTIN_SRC_PATH='drivers/builtin/src' BUILTIN_SRC_PATH='drivers/builtin/src'
CONFIG_TEST_DRIVER_H='tests/configs/config_test_driver.h' CONFIG_TEST_DRIVER_H='tests/configs/config_test_driver.h'
TF_PSA_CRYPTO_ROOT_DIR="$PWD"
MBEDTLS_ROOT_DIR=""
config_files="$CRYPTO_CONFIG_H $CONFIG_TEST_DRIVER_H" config_files="$CRYPTO_CONFIG_H $CONFIG_TEST_DRIVER_H"
fi fi
@@ -214,7 +218,7 @@ pre_initialize_variables () {
: ${OPENSSL_NEXT:="$OPENSSL"} : ${OPENSSL_NEXT:="$OPENSSL"}
: ${GNUTLS_CLI:="gnutls-cli"} : ${GNUTLS_CLI:="gnutls-cli"}
: ${GNUTLS_SERV:="gnutls-serv"} : ${GNUTLS_SERV:="gnutls-serv"}
: ${OUT_OF_SOURCE_DIR:=./mbedtls_out_of_source_build} : ${OUT_OF_SOURCE_DIR:=$PWD/out_of_source_build}
: ${ARMC6_BIN_DIR:=/usr/bin} : ${ARMC6_BIN_DIR:=/usr/bin}
: ${ARM_NONE_EABI_GCC_PREFIX:=arm-none-eabi-} : ${ARM_NONE_EABI_GCC_PREFIX:=arm-none-eabi-}
: ${ARM_LINUX_GNUEABI_GCC_PREFIX:=arm-linux-gnueabi-} : ${ARM_LINUX_GNUEABI_GCC_PREFIX:=arm-linux-gnueabi-}
@@ -400,6 +404,11 @@ cleanup()
rm -f programs/test/cmake_package_install/Makefile rm -f programs/test/cmake_package_install/Makefile
rm -f programs/test/cmake_package_install/cmake_package_install 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
# Restore files that may have been clobbered by the job # Restore files that may have been clobbered by the job
restore_backed_up_files restore_backed_up_files
} }
@@ -937,6 +946,10 @@ run_component () {
"${dd_cmd[@]}" "${dd_cmd[@]}"
fi fi
if in_tf_psa_crypto_repo; then
pre_create_tf_psa_crypto_out_of_source_directory
fi
# Run the component in a subshell, with error trapping and output # Run the component in a subshell, with error trapping and output
# redirection set up based on the relevant options. # redirection set up based on the relevant options.
if [ $KEEP_GOING -eq 1 ]; then if [ $KEEP_GOING -eq 1 ]; then
@@ -975,6 +988,11 @@ run_component () {
unset current_component unset current_component
} }
pre_create_tf_psa_crypto_out_of_source_directory () {
rm -rf "$OUT_OF_SOURCE_DIR"
mkdir "$OUT_OF_SOURCE_DIR"
}
################################################################ ################################################################
#### Main #### Main
################################################################ ################################################################