summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--classes/machine-overrides-extender.bbclass7
1 files changed, 4 insertions, 3 deletions
diff --git a/classes/machine-overrides-extender.bbclass b/classes/machine-overrides-extender.bbclass
index 82bb4543..b9b00ebe 100644
--- a/classes/machine-overrides-extender.bbclass
+++ b/classes/machine-overrides-extender.bbclass
@@ -22,9 +22,7 @@ def machine_overrides_extender(d):
22 for override in machine_overrides: 22 for override in machine_overrides:
23 machine_overrides_filter_out += (d.getVar('MACHINEOVERRIDES_EXTENDER_FILTER_OUT:%s' % override) or '').split() 23 machine_overrides_filter_out += (d.getVar('MACHINEOVERRIDES_EXTENDER_FILTER_OUT:%s' % override) or '').split()
24 24
25 # Drop any overrides of filter_out prior extending 25 # Extend the overrides
26 machine_overrides = [o for o in machine_overrides if o not in machine_overrides_filter_out]
27
28 for override in machine_overrides: 26 for override in machine_overrides:
29 extender = d.getVar('MACHINEOVERRIDES_EXTENDER:%s' % override) 27 extender = d.getVar('MACHINEOVERRIDES_EXTENDER:%s' % override)
30 28
@@ -40,6 +38,9 @@ def machine_overrides_extender(d):
40 for e in extender: 38 for e in extender:
41 machine_overrides.insert(index, e) 39 machine_overrides.insert(index, e)
42 40
41 # Drop any overrides of filter_out after extending
42 machine_overrides = [o for o in machine_overrides if o not in machine_overrides_filter_out]
43
43 return ':'.join(machine_overrides) 44 return ':'.join(machine_overrides)
44 45
45python machine_overrides_extender_handler() { 46python machine_overrides_extender_handler() {