From d3d9a37aa7addac066762f624ec857d34c57343b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 3 Mar 2012 09:45:58 +0000 Subject: parse/ast: Expand inherit statements before splitting them 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". (Bitbake rev: 2568e9ace6e6f483e1bf2a9ef2f4d8318d6c85b7) Signed-off-by: Richard Purdie --- bitbake/lib/bb/parse/ast.py | 4 ++-- bitbake/lib/bb/parse/parse_py/BBHandler.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'bitbake/lib/bb/parse') diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py index 7cef3d0373..eae840fa8d 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 125f458de7..815bce1d75 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) -- cgit v1.2.3-54-g00ecf