diff options
| author | Peter Kjellerstedt <pkj@axis.com> | 2025-09-16 23:19:33 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-11-07 13:15:35 +0000 |
| commit | 08ef69c2d1af7c16f380c893bafda5570e187323 (patch) | |
| tree | a9b57acadaeedaf0bd536ffb64a813a6916519aa /bitbake/lib/bb/parse/ast.py | |
| parent | 8b123e2422b255b671176fe1c39672a0bcaae241 (diff) | |
| download | poky-08ef69c2d1af7c16f380c893bafda5570e187323.tar.gz | |
bitbake: parse: Make include_all support empty variable expansions
include and require support empty variable expansions, typically used
with conditional expansions. However, include_all does not, and instead
reports an error for the first path in BBPATH.
Rewrite include_all so that its behavior matches include and require.
(Bitbake rev: 7e3a64b853b5374205c05b0ab09122f09a1eedfb)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/parse/ast.py')
| -rw-r--r-- | bitbake/lib/bb/parse/ast.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py index e6ff1ff765..4a16b2f05c 100644 --- a/bitbake/lib/bb/parse/ast.py +++ b/bitbake/lib/bb/parse/ast.py | |||
| @@ -53,10 +53,9 @@ class IncludeAllNode(AstNode): | |||
| 53 | Include the file and evaluate the statements | 53 | Include the file and evaluate the statements |
| 54 | """ | 54 | """ |
| 55 | s = data.expand(self.what_file) | 55 | s = data.expand(self.what_file) |
| 56 | logger.debug2("CONF %s:%s: including %s", self.filename, self.lineno, s) | 56 | logger.debug2("CONF %s:%s: including all %s", self.filename, self.lineno, s) |
| 57 | 57 | ||
| 58 | for path in data.getVar("BBPATH").split(":"): | 58 | bb.parse.ConfHandler.include(self.filename, s, self.lineno, data, False, all=True) |
| 59 | bb.parse.ConfHandler.include(self.filename, os.path.join(path, s), self.lineno, data, False) | ||
| 60 | 59 | ||
| 61 | class ExportNode(AstNode): | 60 | class ExportNode(AstNode): |
| 62 | def __init__(self, filename, lineno, var): | 61 | def __init__(self, filename, lineno, var): |
