machine-overrides-extender.bbclass: Fix multilib parsing

The 'ConfigParsed' event was too early and when we mangled the
MACHINEOVERRIDES using the extender, we ended overriding some values
when using together with multilib.

This fixes the multilib use-case and keep current ones working.

Reported-by: Cristinel Panfir <cristinel.panfir@nxp.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
(cherry picked from commit a59a205985)
This commit is contained in:
Otavio Salvador 2018-05-28 16:27:50 -03:00
parent affb4b17d3
commit 1dfd9e365e

View File

@ -15,6 +15,10 @@
# Copyright 2016-2017 (C) O.S. Systems Software LTDA.
def machine_overrides_extender(d):
variant = d.getVar("BBEXTENDVARIANT")
if variant:
return
machine_overrides = (d.getVar('MACHINEOVERRIDES', True) or '').split(':')
# Gather the list of overrides to filter out
@ -44,5 +48,6 @@ def machine_overrides_extender(d):
python machine_overrides_extender_handler() {
machine_overrides_extender(e.data)
}
machine_overrides_extender_handler[eventmask] = "bb.event.ConfigParsed"
machine_overrides_extender_handler[eventmask] = "bb.event.RecipePreFinalise"
addhandler machine_overrides_extender_handler