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 a59a2059850c493772da39d2fd9ee71494326d12)

diff --git a/classes/machine-overrides-extender.bbclass b/classes/machine-overrides-extender.bbclass
index f333a0fcb7defb681d06e93e42c7712f221ee768..6c2ec32e13feae7390a71359bde16c746cb57839 100644 (file)
--- a/classes/machine-overrides-extender.bbclass
+++ b/classes/machine-overrides-extender.bbclass
@@ -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