From dcb596d8d6a34f145edf0e2090cb9128fa7d9ccf Mon Sep 17 00:00:00 2001 From: Kevin Hao Date: Tue, 9 Aug 2022 18:28:19 +0800 Subject: uboot-config.bbclass: Don't bail out early in multi configs Previously we had the support to build multiple u-boot configs for a machine, but after the change in the commit 801a27d73b10 ("uboot-config.bbclass: Raise error for bad key"), this anonymous function would bail out after handling the first config in UBOOT_CONFIG. This is definitely not what we want. Fix it by making sure all the configs are handled. Fixed: 801a27d73b10 ("uboot-config.bbclass: Raise error for bad key") (From OE-Core rev: 372798afe028569b07ac55e0dc1ff377d83d18bf) Signed-off-by: Kevin Hao Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/classes-recipe/uboot-config.bbclass | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'meta/classes-recipe/uboot-config.bbclass') diff --git a/meta/classes-recipe/uboot-config.bbclass b/meta/classes-recipe/uboot-config.bbclass index 9889d026fa..7ab006a20d 100644 --- a/meta/classes-recipe/uboot-config.bbclass +++ b/meta/classes-recipe/uboot-config.bbclass @@ -112,8 +112,10 @@ python () { if len(ubootconfig) > 0: for config in ubootconfig: + found = False for f, v in ubootconfigflags.items(): if config == f: + found = True items = v.split(',') if items[0] and len(items) > 3: raise bb.parse.SkipRecipe('Only config,images,binary can be specified!') @@ -128,6 +130,8 @@ python () { else: bb.debug(1, "Appending '%s' to UBOOT_BINARIES." % ubootbinary) d.appendVar('UBOOT_BINARIES', ' ' + ubootbinary) - return - raise bb.parse.SkipRecipe("The selected UBOOT_CONFIG key %s has no match in %s." % (ubootconfig, ubootconfigflags.keys())) + break + + if not found: + raise bb.parse.SkipRecipe("The selected UBOOT_CONFIG key %s has no match in %s." % (ubootconfig, ubootconfigflags.keys())) } -- cgit v1.2.3-54-g00ecf