diff options
-rw-r--r-- | meta/classes/base.bbclass | 4 | ||||
-rw-r--r-- | meta/lib/oe/utils.py | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 4d69cafbcd..4ec1eda6bc 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass | |||
@@ -292,8 +292,8 @@ python base_eventhandler() { | |||
292 | e.data.setVar('BB_VERSION', bb.__version__) | 292 | e.data.setVar('BB_VERSION', bb.__version__) |
293 | pkgarch_mapping(e.data) | 293 | pkgarch_mapping(e.data) |
294 | preferred_ml_updates(e.data) | 294 | preferred_ml_updates(e.data) |
295 | e.data.appendVar('DISTRO_FEATURES', oe.utils.features_backfill("DISTRO_FEATURES", e.data)) | 295 | oe.utils.features_backfill("DISTRO_FEATURES", e.data) |
296 | e.data.appendVar('MACHINE_FEATURES', oe.utils.features_backfill("MACHINE_FEATURES", e.data)) | 296 | oe.utils.features_backfill("MACHINE_FEATURES", e.data) |
297 | 297 | ||
298 | if isinstance(e, bb.event.BuildStarted): | 298 | if isinstance(e, bb.event.BuildStarted): |
299 | statuslines = [] | 299 | statuslines = [] |
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py index 8d3efe440c..b269f32277 100644 --- a/meta/lib/oe/utils.py +++ b/meta/lib/oe/utils.py | |||
@@ -96,16 +96,14 @@ def features_backfill(var,d): | |||
96 | # disturbing distributions that have already set DISTRO_FEATURES. | 96 | # disturbing distributions that have already set DISTRO_FEATURES. |
97 | # Distributions wanting to elide a value in DISTRO_FEATURES_BACKFILL should | 97 | # Distributions wanting to elide a value in DISTRO_FEATURES_BACKFILL should |
98 | # add the feature to DISTRO_FEATURES_BACKFILL_CONSIDERED | 98 | # add the feature to DISTRO_FEATURES_BACKFILL_CONSIDERED |
99 | 99 | features = (d.getVar(var, True) or "").split() | |
100 | backfill = (d.getVar(var+"_BACKFILL", True) or "").split() | 100 | backfill = (d.getVar(var+"_BACKFILL", True) or "").split() |
101 | considered = (d.getVar(var+"_BACKFILL_CONSIDERED", True) or "").split() | 101 | considered = (d.getVar(var+"_BACKFILL_CONSIDERED", True) or "").split() |
102 | 102 | ||
103 | addfeatures = [] | 103 | addfeatures = [] |
104 | for feature in backfill: | 104 | for feature in backfill: |
105 | if feature not in considered: | 105 | if feature not in features and feature not in considered: |
106 | addfeatures.append(feature) | 106 | addfeatures.append(feature) |
107 | 107 | ||
108 | if addfeatures: | 108 | if addfeatures: |
109 | return " %s" % (" ".join(addfeatures)) | 109 | d.appendVar(var, " " + " ".join(addfeatures)) |
110 | else: | ||
111 | return "" | ||