From a59a2059850c493772da39d2fd9ee71494326d12 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 28 May 2018 16:27:50 -0300 Subject: [PATCH] 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 Signed-off-by: Otavio Salvador --- classes/machine-overrides-extender.bbclass | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 -- 2.40.1