From 53841ce521d44c0c9cca512675a12f81a491fe52 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 12 Jun 2013 16:31:57 +0000 Subject: classes/conf: Add eventmasks for event handlers Now that bitbake supports masking events for event handlers, lets use this so event handlers are only called for events they care about. This lets us simplify the code indentation a bit at least as well as mildly improving the event handling performance. (From OE-Core rev: bff73743280f9eafebe4591f7368ead91a4eb74d) Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'meta/classes/base.bbclass') diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 8af104f765..3a0ff6bd63 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -32,12 +32,12 @@ def oe_import(d): inject(toimport.split(".", 1)[0], imported) python oe_import_eh () { - if isinstance(e, bb.event.ConfigParsed): - oe_import(e.data) - e.data.setVar("NATIVELSBSTRING", lsb_distro_identifier(e.data)) + oe_import(e.data) + e.data.setVar("NATIVELSBSTRING", lsb_distro_identifier(e.data)) } addhandler oe_import_eh +oe_import_eh[eventmask] = "bb.event.ConfigParsed" def lsb_distro_identifier(d): adjust = d.getVar('LSB_DISTRO_ADJUST', True) @@ -299,6 +299,7 @@ def buildcfg_neededvars(d): bb.fatal('The following variable(s) were not set: %s\nPlease set them directly, or choose a MACHINE or DISTRO that sets them.' % ', '.join(pesteruser)) addhandler base_eventhandler +base_eventhandler[eventmask] = "bb.event.ConfigParsed bb.event.BuildStarted" python base_eventhandler() { if isinstance(e, bb.event.ConfigParsed): e.data.setVar('BB_VERSION', bb.__version__) -- cgit v1.2.3-54-g00ecf