[OE-core] [PATCH v4] base.bbclass: Add support to EXTRA_DISTRO_FEATURES
Otavio Salvador
otavio at ossystems.com.br
Thu Aug 1 14:05:32 UTC 2013
This allow the addition and removal of distro features easily. To add
a feature, use:
EXTRA_DISTRO_FEATURES += "wayland"
and to remove, use '~' prefix, as:
EXTRA_DISTRO_FEATURES += "~x11"
This code has been mostly copied from Mentor Graphics public layer but
changed the variable name for a more descriptive name. The original
code can be seen at user_feature.bbclass at:
http://git.yoctoproject.org/cgit/cgit.cgi/meta-mentor
Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
---
Changes in v4:
- Drop _prepend/_append hack and remove/add DISTRO_FEATURES (thanks to
RP for the tip).
Changes in v3:
- Drop _prepend/_append flags from DISTRO_FEATURES to avoid the re-add
Changes in v2:
- Use data copy to fix wrong prepend/append expanding.
meta/classes/base.bbclass | 4 ++++
meta/lib/oe/utils.py | 24 ++++++++++++++++++++++++
2 files changed, 28 insertions(+)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 9c92e0b..83f6458 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -298,6 +298,9 @@ def buildcfg_neededvars(d):
if pesteruser:
bb.fatal('The following variable(s) were not set: %s\nPlease set them directly, or choose a MACHINE or DISTRO that sets them.' % ', '.join(pesteruser))
+EXTRA_DISTRO_FEATURES ?= ""
+EXTRA_DISTRO_FEATURES[type] = "list"
+
addhandler base_eventhandler
base_eventhandler[eventmask] = "bb.event.ConfigParsed bb.event.BuildStarted"
python base_eventhandler() {
@@ -307,6 +310,7 @@ python base_eventhandler() {
preferred_ml_updates(e.data)
oe.utils.features_backfill("DISTRO_FEATURES", e.data)
oe.utils.features_backfill("MACHINE_FEATURES", e.data)
+ oe.utils.extra_distro_features(e.data)
if isinstance(e, bb.event.BuildStarted):
localdata = bb.data.createCopy(e.data)
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index 82987e8..0c9dde0 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -117,6 +117,30 @@ def features_backfill(var,d):
if addfeatures:
d.appendVar(var, " " + " ".join(addfeatures))
+def extra_distro_features(d):
+ import oe.data
+
+ l = d.createCopy()
+ l.finalize()
+
+ extra_features = oe.data.typed_value('EXTRA_DISTRO_FEATURES', l)
+ if not extra_features:
+ return
+
+ distro_features = l.getVar('DISTRO_FEATURES', True).split()
+ for feature in extra_features:
+ if feature.startswith('~'):
+ feature = feature[1:]
+ if feature in distro_features:
+ distro_features.remove(feature)
+ else:
+ if feature not in distro_features:
+ distro_features.append(feature)
+
+ # Avoid readding the removed features later
+ d.delVar("DISTRO_FEATURES")
+
+ d.setVar('DISTRO_FEATURES', ' '.join(distro_features))
def packages_filter_out_system(d):
"""
--
1.8.3.2
More information about the Openembedded-core
mailing list