All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH] utils/genrandconfig: Add optee-os custom tarball handler
@ 2022-06-29  7:55 Köry Maincent via buildroot
  2022-07-06 21:38 ` Thomas Petazzoni via buildroot
  0 siblings, 1 reply; 2+ messages in thread
From: Köry Maincent via buildroot @ 2022-06-29  7:55 UTC (permalink / raw)
  To: buildroot; +Cc: Kory Maincent

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(+)

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')
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [Buildroot] [PATCH] utils/genrandconfig: Add optee-os custom tarball handler
  2022-06-29  7:55 [Buildroot] [PATCH] utils/genrandconfig: Add optee-os custom tarball handler Köry Maincent via buildroot
@ 2022-07-06 21:38 ` Thomas Petazzoni via buildroot
  0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-07-06 21:38 UTC (permalink / raw)
  To: Köry Maincent via buildroot; +Cc: Köry Maincent

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
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-07-06 21:38 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-29  7:55 [Buildroot] [PATCH] utils/genrandconfig: Add optee-os custom tarball handler Köry Maincent via buildroot
2022-07-06 21:38 ` Thomas Petazzoni via buildroot

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.