diff options
author | Ross Burton <ross.burton@intel.com> | 2013-03-09 10:33:25 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-10 04:36:52 +0000 |
commit | 0aad8decf0eb17b90153225493f28835d24f043a (patch) | |
tree | 83c479e4efca36caf773132e3e63f22825540f62 /meta/lib/oe/utils.py | |
parent | 9b4e10acc53d22ee9a6bb566c1d665e45f4407cc (diff) | |
download | ast2050-yocto-poky-0aad8decf0eb17b90153225493f28835d24f043a.zip ast2050-yocto-poky-0aad8decf0eb17b90153225493f28835d24f043a.tar.gz |
base.bbclass: don't backfill features that already exist
It's too easy to cause rebuilds because the DISTRO_FEATURES have changed in
meaningless ways (such as re-ordering or duplicate items). Help stop this by
checking if the feature to be back-filled is already present.
(From OE-Core rev: 63c7192119d54b92d908441109ed4e4fff761cba)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/utils.py')
-rw-r--r-- | meta/lib/oe/utils.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py index 8d3efe4..b269f32 100644 --- a/meta/lib/oe/utils.py +++ b/meta/lib/oe/utils.py @@ -96,16 +96,14 @@ def features_backfill(var,d): # disturbing distributions that have already set DISTRO_FEATURES. # Distributions wanting to elide a value in DISTRO_FEATURES_BACKFILL should # add the feature to DISTRO_FEATURES_BACKFILL_CONSIDERED - + features = (d.getVar(var, True) or "").split() backfill = (d.getVar(var+"_BACKFILL", True) or "").split() considered = (d.getVar(var+"_BACKFILL_CONSIDERED", True) or "").split() addfeatures = [] for feature in backfill: - if feature not in considered: + if feature not in features and feature not in considered: addfeatures.append(feature) if addfeatures: - return " %s" % (" ".join(addfeatures)) - else: - return "" + d.appendVar(var, " " + " ".join(addfeatures)) |