classes/machine-overrides-extender: Postpone filter out

The overrides ought to allow the filter out execution even for overrides
included during the extension, for this to work we need to postpone it.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
This commit is contained in:
Otavio Salvador 2022-02-17 18:36:55 -03:00
parent deea917d0a
commit a3b102a9ed

View File

@ -22,9 +22,7 @@ def machine_overrides_extender(d):
for override in machine_overrides:
machine_overrides_filter_out += (d.getVar('MACHINEOVERRIDES_EXTENDER_FILTER_OUT:%s' % override) or '').split()
# Drop any overrides of filter_out prior extending
machine_overrides = [o for o in machine_overrides if o not in machine_overrides_filter_out]
# Extend the overrides
for override in machine_overrides:
extender = d.getVar('MACHINEOVERRIDES_EXTENDER:%s' % override)
@ -40,6 +38,9 @@ def machine_overrides_extender(d):
for e in extender:
machine_overrides.insert(index, e)
# Drop any overrides of filter_out after extending
machine_overrides = [o for o in machine_overrides if o not in machine_overrides_filter_out]
return ':'.join(machine_overrides)
python machine_overrides_extender_handler() {