From a981df3cc9bf410d24f39919959952bdc6c76d03 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 9 Jun 2011 17:30:17 +0100 Subject: bitbake/event/ast: Add RecipePreFinalise event One of the implications is we need to register the event handlers before executing the anonymous python functions. I can't find any issue with making that change in any existing metadata use cases. Signed-off-by: Richard Purdie --- lib/bb/parse/ast.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'lib/bb/parse/ast.py') diff --git a/lib/bb/parse/ast.py b/lib/bb/parse/ast.py index 547ea679b..1180911a7 100644 --- a/lib/bb/parse/ast.py +++ b/lib/bb/parse/ast.py @@ -308,12 +308,6 @@ def handleInherit(statements, filename, lineno, m): def finalize(fn, d, variant = None): bb.data.expandKeys(d) - bb.data.update_data(d) - code = [] - for funcname in bb.data.getVar("__BBANONFUNCS", d) or []: - code.append("%s(d)" % funcname) - bb.utils.simple_exec("\n".join(code), {"d": d}) - bb.data.update_data(d) all_handlers = {} for var in bb.data.getVar('__BBHANDLERS', d) or []: @@ -321,6 +315,15 @@ def finalize(fn, d, variant = None): handler = bb.data.getVar(var, d) bb.event.register(var, handler) + bb.event.fire(bb.event.RecipePreFinalise(fn), d) + + bb.data.update_data(d) + code = [] + for funcname in bb.data.getVar("__BBANONFUNCS", d) or []: + code.append("%s(d)" % funcname) + bb.utils.simple_exec("\n".join(code), {"d": d}) + bb.data.update_data(d) + tasklist = bb.data.getVar('__BBTASKS', d) or [] bb.build.add_tasks(tasklist, d) -- cgit 1.2.3-korg