mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 05:29:32 +00:00
Code Issues Projects Releases Wiki Activity

uboot-config.bbclass: Don't bail out early in multi configs

Browse Source 
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 <kexin.hao@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Kevin Hao
2022-08-09 18:28:19 +08:00
committed by Richard Purdie
parent 4ed54513b9
commit dcb596d8d6
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes-recipe/uboot-config.bbclass
+6 -2
View File
@@ -112,8 +112,10 @@ python () {
if len(ubootconfig) > 0: if len(ubootconfig) > 0:
for config in ubootconfig: for config in ubootconfig:
found = False
for f, v in ubootconfigflags.items(): for f, v in ubootconfigflags.items():
if config == f: if config == f:
found = True
items = v.split(',') items = v.split(',')
if items[0] and len(items) > 3: if items[0] and len(items) > 3:
raise bb.parse.SkipRecipe('Only config,images,binary can be specified!') raise bb.parse.SkipRecipe('Only config,images,binary can be specified!')
@@ -128,6 +130,8 @@ python () {
else: else:
bb.debug(1, "Appending '%s' to UBOOT_BINARIES." % ubootbinary) bb.debug(1, "Appending '%s' to UBOOT_BINARIES." % ubootbinary)
d.appendVar('UBOOT_BINARIES', ' ' + ubootbinary) d.appendVar('UBOOT_BINARIES', ' ' + ubootbinary)
return break
raise bb.parse.SkipRecipe("The selected UBOOT_CONFIG key %s has no match in %s." % (ubootconfig, ubootconfigflags.keys()))
if not found:
raise bb.parse.SkipRecipe("The selected UBOOT_CONFIG key %s has no match in %s." % (ubootconfig, ubootconfigflags.keys()))
} }