From 70f9497918c51aa15e72c4e2f721033c8db7bc85 Mon Sep 17 00:00:00 2001 From: Hanno Becker Date: Fri, 23 Nov 2018 16:51:45 +0000 Subject: [PATCH] Mbed TLS importer: Call `config.pl --force` to accept unknown option The new PSA-aware Mbed TLS importer script calls `config.pl` on the Mbed TLS config.h to set the PSA configuration option MBEDTLS_PSA_CRYPTO_STORAGE_C which isn't documented in config.h. config.pl therefore fails, and so does the importer. This commit fixes this by calling `config.pl` with the `--force` option which amends the given `config.h` by a `#define` for the requested option if the option isn't present in the file. --- features/mbedtls/importer/adjust-config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/mbedtls/importer/adjust-config.sh b/features/mbedtls/importer/adjust-config.sh index b42f6d1f61..d6cc758a73 100755 --- a/features/mbedtls/importer/adjust-config.sh +++ b/features/mbedtls/importer/adjust-config.sh @@ -22,7 +22,7 @@ SCRIPT=$1 FILE=$2 conf() { - $SCRIPT -f $FILE $@ + $SCRIPT -f $FILE --force $@ } add_code() {