| Message ID | 20220629075600.1506639-1-kory.maincent@bootlin.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | utils/genrandconfig: Add optee-os custom tarball handler | expand |
On Wed, 29 Jun 2022 09:55:59 +0200 Köry Maincent via buildroot <buildroot@buildroot.org> wrote: > From: Kory Maincent <kory.maincent@bootlin.com> > > Add a handler to make sure that a random configuration with empty tarball > location doesn't fail. It reverts to BR2_TARGET_OPTEE_OS_LATEST in that > case. > > Signed-off-by: Kory Maincent <kory.maincent@bootlin.com> > --- > utils/genrandconfig | 7 +++++++ > 1 file changed, 7 insertions(+) Applied to master with a slightly tweaked commit message. Thanks! Thomas
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')