summaryrefslogtreecommitdiffstats
path: root/classes/machine-overrides-extender.bbclass
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2018-05-28 16:27:50 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2018-06-01 09:49:26 -0300
commita59a2059850c493772da39d2fd9ee71494326d12 (patch)
tree9f4905fa58ee8b3af49b7d7c877a4a0fb5cba270 /classes/machine-overrides-extender.bbclass
parent83edf6a9a310b2b542f488c2a723b36869aaff7a (diff)
downloadmeta-freescale-a59a2059850c493772da39d2fd9ee71494326d12.tar.gz
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>
Diffstat (limited to 'classes/machine-overrides-extender.bbclass')
-rw-r--r--classes/machine-overrides-extender.bbclass7
1 files changed, 6 insertions, 1 deletions
diff --git a/classes/machine-overrides-extender.bbclass b/classes/machine-overrides-extender.bbclass
index f333a0fc..6c2ec32e 100644
--- a/classes/machine-overrides-extender.bbclass
+++ b/classes/machine-overrides-extender.bbclass
@@ -15,6 +15,10 @@
15# Copyright 2016-2017 (C) O.S. Systems Software LTDA. 15# Copyright 2016-2017 (C) O.S. Systems Software LTDA.
16 16
17def machine_overrides_extender(d): 17def machine_overrides_extender(d):
18 variant = d.getVar("BBEXTENDVARIANT")
19 if variant:
20 return
21
18 machine_overrides = (d.getVar('MACHINEOVERRIDES', True) or '').split(':') 22 machine_overrides = (d.getVar('MACHINEOVERRIDES', True) or '').split(':')
19 23
20 # Gather the list of overrides to filter out 24 # Gather the list of overrides to filter out
@@ -44,5 +48,6 @@ def machine_overrides_extender(d):
44python machine_overrides_extender_handler() { 48python machine_overrides_extender_handler() {
45 machine_overrides_extender(e.data) 49 machine_overrides_extender(e.data)
46} 50}
47machine_overrides_extender_handler[eventmask] = "bb.event.ConfigParsed" 51
52machine_overrides_extender_handler[eventmask] = "bb.event.RecipePreFinalise"
48addhandler machine_overrides_extender_handler 53addhandler machine_overrides_extender_handler