aboutsummaryrefslogtreecommitdiffstats
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:52:07 -0300
commit1dfd9e365e7c417ccf4ae3af2ba17217f87a8f05 (patch)
tree0d0000d790dcc5fe30af811715da2a8ad288674b
parentaffb4b17d3d97ae45bdc4887268ba1d88fccd876 (diff)
downloadmeta-freescale-1dfd9e365e7c417ccf4ae3af2ba17217f87a8f05.tar.gz
meta-freescale-1dfd9e365e7c417ccf4ae3af2ba17217f87a8f05.tar.bz2
meta-freescale-1dfd9e365e7c417ccf4ae3af2ba17217f87a8f05.zip
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)
-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 @@
# 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