diff options
author | Kevin Hao <kexin.hao@windriver.com> | 2022-08-09 18:28:19 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-12 19:22:04 +0100 |
commit | dcb596d8d6a34f145edf0e2090cb9128fa7d9ccf (patch) | |
tree | f4a3b46fa1a8edf87d4b244fae55722388eb6ad9 /meta/classes-recipe/uboot-config.bbclass | |
parent | 4ed54513b93c55f6b8d36474bba651785f4fe2a2 (diff) | |
download | poky-dcb596d8d6a34f145edf0e2090cb9128fa7d9ccf.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")
(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>
Diffstat (limited to 'meta/classes-recipe/uboot-config.bbclass')
-rw-r--r-- | meta/classes-recipe/uboot-config.bbclass | 8 |
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 () { | |||
112 | 112 | ||
113 | if len(ubootconfig) > 0: | 113 | if len(ubootconfig) > 0: |
114 | for config in ubootconfig: | 114 | for config in ubootconfig: |
115 | found = False | ||
115 | for f, v in ubootconfigflags.items(): | 116 | for f, v in ubootconfigflags.items(): |
116 | if config == f: | 117 | if config == f: |
118 | found = True | ||
117 | items = v.split(',') | 119 | items = v.split(',') |
118 | if items[0] and len(items) > 3: | 120 | if items[0] and len(items) > 3: |
119 | raise bb.parse.SkipRecipe('Only config,images,binary can be specified!') | 121 | raise bb.parse.SkipRecipe('Only config,images,binary can be specified!') |
@@ -128,6 +130,8 @@ python () { | |||
128 | else: | 130 | else: |
129 | bb.debug(1, "Appending '%s' to UBOOT_BINARIES." % ubootbinary) | 131 | bb.debug(1, "Appending '%s' to UBOOT_BINARIES." % ubootbinary) |
130 | d.appendVar('UBOOT_BINARIES', ' ' + ubootbinary) | 132 | d.appendVar('UBOOT_BINARIES', ' ' + ubootbinary) |
131 | return | 133 | break |
132 | raise bb.parse.SkipRecipe("The selected UBOOT_CONFIG key %s has no match in %s." % (ubootconfig, ubootconfigflags.keys())) | 134 | |
135 | if not found: | ||
136 | raise bb.parse.SkipRecipe("The selected UBOOT_CONFIG key %s has no match in %s." % (ubootconfig, ubootconfigflags.keys())) | ||
133 | } | 137 | } |