mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

base.bbclass: Merge two ConfigParsed event handlers

Browse Source 
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>
This commit is contained in:
Richard Purdie
2014-03-26 09:31:09 +00:00
parent b015b64a9d
commit dc29d2abd2
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/base.bbclass
+1 -7
View File
@@ -36,13 +36,6 @@ def oe_import(d):
# We need the oe module name space early (before INHERITs get added) # We need the oe module name space early (before INHERITs get added)
OE_IMPORTED := "${@oe_import(d)}" 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): def lsb_distro_identifier(d):
adjust = d.getVar('LSB_DISTRO_ADJUST', True) adjust = d.getVar('LSB_DISTRO_ADJUST', True)
adjust_func = None adjust_func = None
@@ -294,6 +287,7 @@ addhandler base_eventhandler
base_eventhandler[eventmask] = "bb.event.ConfigParsed bb.event.BuildStarted" base_eventhandler[eventmask] = "bb.event.ConfigParsed bb.event.BuildStarted"
python base_eventhandler() { python base_eventhandler() {
if isinstance(e, bb.event.ConfigParsed): if isinstance(e, bb.event.ConfigParsed):
e.data.setVar("NATIVELSBSTRING", lsb_distro_identifier(e.data))
e.data.setVar('BB_VERSION', bb.__version__) e.data.setVar('BB_VERSION', bb.__version__)
pkgarch_mapping(e.data) pkgarch_mapping(e.data)
preferred_ml_updates(e.data) preferred_ml_updates(e.data)