From d780b828fcbe2b4a1f125d3460f28379d5c27b8e Mon Sep 17 00:00:00 2001 From: Kory Maincent Date: Wed, 29 Jun 2022 09:55:59 +0200 Subject: [PATCH] utils/genrandconfig: add optee-os custom tarball handling Add a custom case to make sure that a random configuration with an empty tarball location for OP-TEE OS doesn't fail. It reverts to BR2_TARGET_OPTEE_OS_LATEST in that case. Signed-off-by: Kory Maincent Signed-off-by: Thomas Petazzoni --- utils/genrandconfig | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index 6f748fa709..75757917c2 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -463,6 +463,13 @@ def fixup_config(sysinfo, configfile): configlines.remove('BR2_TARGET_BAREBOX_USE_DEFCONFIG=y\n') configlines.remove('BR2_TARGET_BAREBOX_BOARD_DEFCONFIG=""\n') + if 'BR2_TARGET_OPTEE_OS=y\n' in configlines and \ + 'BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL=y\n' in configlines and \ + 'BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL_LOCATION=""\n' in configlines: + configlines.remove('BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL=y\n') + configlines.append('BR2_TARGET_OPTEE_OS_LATEST=y\n') + configlines.remove('BR2_TARGET_OPTEE_OS_CUSTOM_TARBALL_LOCATION=""\n') + if 'BR2_TARGET_OPTEE_OS=y\n' in configlines and \ 'BR2_TARGET_OPTEE_OS_PLATFORM=""\n' in configlines: configlines.remove('BR2_TARGET_OPTEE_OS=y\n')