summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Hao <kexin.hao@windriver.com>2022-08-09 18:28:19 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-08-12 19:22:01 +0100
commit372798afe028569b07ac55e0dc1ff377d83d18bf (patch)
tree39c828f346ee7f2bbf666307fc62d408f604f225
parent452ded8e88db51f8b2fd704d40860ea84c433ada (diff)
downloadopenembedded-core-372798afe028569b07ac55e0dc1ff377d83d18bf.tar.gz
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") Signed-off-by: Kevin Hao <kexin.hao@windriver.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
-rw-r--r--meta/classes-recipe/uboot-config.bbclass8
1 files changed, 6 insertions, 2 deletions
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()))
}