diff options
| author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2025-09-16 23:19:33 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-10-06 17:01:09 +0100 |
| commit | e99ec6a90846a0c7530bf6e43b3af32ba54dec4c (patch) | |
| tree | c564eac2d3126abfa7c3dd060b6c536031c057e5 /bitbake/lib/bb/parse/ast.py | |
| parent | a7c8099fec5aa361523c66065c0c50d44e4372b6 (diff) | |
| download | poky-e99ec6a90846a0c7530bf6e43b3af32ba54dec4c.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: 010928ceac48b20e6ab530f8e256b72201b778ec)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.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 49a0788038..3250211e60 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): |
