mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
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>
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user