From patchwork Sun Mar 4 04:17:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [bitbake-devel] parse/ast: Expand inherit statements before splitting them Date: Sun, 04 Mar 2012 04:17:17 -0000 From: Richard Purdie X-Patchwork-Id: 22653 Message-Id: <1330834637.3949.8.camel@ted> To: bitbake-devel This means that statements that expand to more then one entry such as: CLASSES = "a b" inherit ${CLASSES} work correctly instead of trying to inherit a class called "a b". Signed-off-by: Richard Purdie --- bitbake/lib/bb/cooker.py | 2 +- bitbake/lib/bb/parse/ast.py | 4 ++-- bitbake/lib/bb/parse/parse_py/BBHandler.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 558eadd..d6e1bf8 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -1431,7 +1431,7 @@ def _parse(fn, data, include=True): @catch_parse_error def _inherit(bbclass, data): - bb.parse.BBHandler.inherit([bbclass], "configuration INHERITs", 0, data) + bb.parse.BBHandler.inherit(bbclass, "configuration INHERITs", 0, data) return data class ParsingFailure(Exception): diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py index 7cef3d0..eae840f 100644 --- a/bitbake/lib/bb/parse/ast.py +++ b/bitbake/lib/bb/parse/ast.py @@ -304,7 +304,7 @@ def handleBBHandlers(statements, filename, lineno, m): def handleInherit(statements, filename, lineno, m): classes = m.group(1) - statements.append(InheritNode(filename, lineno, classes.split())) + statements.append(InheritNode(filename, lineno, classes)) def finalize(fn, d, variant = None): all_handlers = {} @@ -452,7 +452,7 @@ def multi_finalize(fn, d): d.setVar("BBEXTENDVARIANT", variantmap[name]) else: d.setVar("PN", "%s-%s" % (pn, name)) - bb.parse.BBHandler.inherit([extendedmap[name]], fn, 0, d) + bb.parse.BBHandler.inherit(extendedmap[name], fn, 0, d) safe_d.setVar("BBCLASSEXTEND", extended) _create_variants(datastores, extendedmap.keys(), extendfunc) diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py index 125f458..815bce1 100644 --- a/bitbake/lib/bb/parse/parse_py/BBHandler.py +++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py @@ -70,8 +70,8 @@ def supports(fn, d): def inherit(files, fn, lineno, d): __inherit_cache = data.getVar('__inherit_cache', d) or [] + files = d.expand(files).split() for file in files: - file = data.expand(file, d) if not os.path.isabs(file) and not file.endswith(".bbclass"): file = os.path.join('classes', '%s.bbclass' % file)