summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-02-23 19:26:09 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-24 16:37:07 (GMT)
commit72ce5c4cde612515451226a1b10f5b348a4a6a4c (patch)
tree4aac6cd016ce96e07299308102c39db120267169 /meta/lib
parent5ac604e67a267ae16a19ea8852098c58cf5f8ca2 (diff)
downloadpoky-72ce5c4cde612515451226a1b10f5b348a4a6a4c.tar.gz
conf/bitbake.conf: add DISTRO_FEATURES_BACKFILL
When introducing new items to DISTRO_FEATURES that control functionality that is already enabled, in order to leave existing distro configuration unchanged we need a way to "backfill" these new feature items onto the existing DISTRO_FEATURES value. This introduces a DISTRO_FEATURES_BACKFILL variable whose items will be added to the end of DISTRO_FEATURES, unless they also appear in DISTRO_FEATURES_BACKFILL_CONSIDERED which distros can use in their configuration to prevent specific items from being added. Fixes [YOCTO #1946]. (From OE-Core rev: 738658d9d5ddef026d2929188744aa225324bf26) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/utils.py20
1 files changed, 20 insertions, 0 deletions
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index 02d5442..8912dac 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -88,3 +88,23 @@ def param_bool(cfg, field, dflt = None):
88def inherits(d, *classes): 88def inherits(d, *classes):
89 """Return True if the metadata inherits any of the specified classes""" 89 """Return True if the metadata inherits any of the specified classes"""
90 return any(bb.data.inherits_class(cls, d) for cls in classes) 90 return any(bb.data.inherits_class(cls, d) for cls in classes)
91
92def distro_features_backfill(d):
93 # This construct allows the addition of new features to DISTRO_FEATURES
94 # that if not present would disable existing functionality, without
95 # disturbing distributions that have already set DISTRO_FEATURES.
96 # Distributions wanting to elide a value in DISTRO_FEATURES_BACKFILL should
97 # add the feature to DISTRO_FEATURES_BACKFILL_CONSIDERED
98
99 backfill = (d.getVar("DISTRO_FEATURES_BACKFILL", True) or "").split()
100 considered = (d.getVar("DISTRO_FEATURES_BACKFILL_CONSIDERED", True) or "").split()
101
102 addfeatures = []
103 for feature in backfill:
104 if feature not in considered:
105 addfeatures.append(feature)
106
107 if addfeatures:
108 return " %s" % (" ".join(addfeatures))
109 else:
110 return ""