summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2022-08-10 13:43:43 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-08-12 11:49:29 +0100
commit12d7157a4145062bfba74dadd493ae870852e7e3 (patch)
tree412637f3b5e02a80a83ad4de2e0cc6f5531768f4 /bitbake
parentbe8ddaed17dd4440ac66df06f3c84c572672339f (diff)
downloadpoky-12d7157a4145062bfba74dadd493ae870852e7e3.tar.gz
bitbake: BBHandler: Make inherit calls more directly
Rather than recursing into the conf handler code, simply call into the parse code directly when inheriting files as we've already resolved the paths and don't need anything the other codepath brings. This makes the codepath clearer at the expense of some slight duplication. (Bitbake rev: 0f4f3af6d93a0018df58b8a1d8d423c78ba6526d) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/parse/parse_py/BBHandler.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py
index 532a4e08f1..1189114341 100644
--- a/bitbake/lib/bb/parse/parse_py/BBHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py
@@ -63,7 +63,10 @@ def inherit(files, fn, lineno, d):
63 logger.debug("Inheriting %s (from %s:%d)" % (file, fn, lineno)) 63 logger.debug("Inheriting %s (from %s:%d)" % (file, fn, lineno))
64 __inherit_cache.append( file ) 64 __inherit_cache.append( file )
65 d.setVar('__inherit_cache', __inherit_cache) 65 d.setVar('__inherit_cache', __inherit_cache)
66 include(fn, file, lineno, d, "inherit") 66 try:
67 bb.parse.handle(file, d, True)
68 except (IOError, OSError) as exc:
69 raise ParseError("Could not inherit file %s: %s" % (fn, exc.strerror), fn, lineno)
67 __inherit_cache = d.getVar('__inherit_cache', False) or [] 70 __inherit_cache = d.getVar('__inherit_cache', False) or []
68 71
69def get_statements(filename, absolute_filename, base_name): 72def get_statements(filename, absolute_filename, base_name):