aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-26 09:31:09 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-27 09:40:02 +0000
commitff919ed132b543f70e9635be7a31f799aafcf8d6 (patch)
tree7384fc205b135f98ba4f2357214e8988cdc87ee8
parent97108a5647f9278280c923ef69d2b0b945a26eef (diff)
downloadopenembedded-core-contrib-ff919ed132b543f70e9635be7a31f799aafcf8d6.tar.gz
base.bbclass: Merge two ConfigParsed event handlers
There were two ConfigParsed event handlers in base.bbclass, this merges them together for small efficiency wins. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/base.bbclass8
1 files changed, 1 insertions, 7 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 7c39db9157..f4f5321ac8 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -36,13 +36,6 @@ def oe_import(d):
# We need the oe module name space early (before INHERITs get added)
OE_IMPORTED := "${@oe_import(d)}"
-python oe_import_eh () {
- 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)
adjust_func = None
@@ -294,6 +287,7 @@ addhandler base_eventhandler
base_eventhandler[eventmask] = "bb.event.ConfigParsed bb.event.BuildStarted"
python base_eventhandler() {
if isinstance(e, bb.event.ConfigParsed):
+ e.data.setVar("NATIVELSBSTRING", lsb_distro_identifier(e.data))
e.data.setVar('BB_VERSION', bb.__version__)
pkgarch_mapping(e.data)
preferred_ml_updates(e.data)