summaryrefslogtreecommitdiffstats
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:42:07 +0000
commitdc29d2abd233bc00983dad1b233e1651b1fbfaae (patch)
tree1cc5b27c635c8f1de5500e90cf87ebc915741f87
parentb015b64a9dfa3c8891f2862628663f8a51eb4029 (diff)
downloadpoky-dc29d2abd233bc00983dad1b233e1651b1fbfaae.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. (From OE-Core rev: ff919ed132b543f70e9635be7a31f799aafcf8d6) 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):
36# We need the oe module name space early (before INHERITs get added) 36# We need the oe module name space early (before INHERITs get added)
37OE_IMPORTED := "${@oe_import(d)}" 37OE_IMPORTED := "${@oe_import(d)}"
38 38
39python oe_import_eh () {
40 e.data.setVar("NATIVELSBSTRING", lsb_distro_identifier(e.data))
41}
42
43addhandler oe_import_eh
44oe_import_eh[eventmask] = "bb.event.ConfigParsed"
45
46def lsb_distro_identifier(d): 39def lsb_distro_identifier(d):
47 adjust = d.getVar('LSB_DISTRO_ADJUST', True) 40 adjust = d.getVar('LSB_DISTRO_ADJUST', True)
48 adjust_func = None 41 adjust_func = None
@@ -294,6 +287,7 @@ addhandler base_eventhandler
294base_eventhandler[eventmask] = "bb.event.ConfigParsed bb.event.BuildStarted" 287base_eventhandler[eventmask] = "bb.event.ConfigParsed bb.event.BuildStarted"
295python base_eventhandler() { 288python base_eventhandler() {
296 if isinstance(e, bb.event.ConfigParsed): 289 if isinstance(e, bb.event.ConfigParsed):
290 e.data.setVar("NATIVELSBSTRING", lsb_distro_identifier(e.data))
297 e.data.setVar('BB_VERSION', bb.__version__) 291 e.data.setVar('BB_VERSION', bb.__version__)
298 pkgarch_mapping(e.data) 292 pkgarch_mapping(e.data)
299 preferred_ml_updates(e.data) 293 preferred_ml_updates(e.data)