aboutsummaryrefslogtreecommitdiffstats
path: root/meta/classes/base.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-24 17:52:56 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-24 20:07:59 +0000
commit22429cdf79ed952072707a929643c7386fa7e056 (patch)
tree156d7efd97690339a61ad7477601df9d79b71fd1 /meta/classes/base.bbclass
parent211e473432230765a48d7af9c66c8737a08cdec7 (diff)
downloadopenembedded-core-22429cdf79ed952072707a929643c7386fa7e056.tar.gz
base: make feature backfilling happen earlier
Backfilling DISTRO_FEATURES and MACHINE_FEATURES with _append statements happens too late to use those variables with conditional inherits, like this: inherit ${@base_contains('DISTRO_FEATURES','sysvinit','update-rc.d_real','',d)} Instead, do the backfilling at ConfigParse time so that it happens earlier in the parse, which results in that inherit behaving as expected when sysvinit was backfilled. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/base.bbclass')
-rw-r--r--meta/classes/base.bbclass2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index b427a5e335..dafded3e42 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -314,6 +314,8 @@ python base_eventhandler() {
generate_git_config(e)
pkgarch_mapping(e.data)
preferred_ml_updates(e.data)
+ e.data.appendVar('DISTRO_FEATURES', oe.utils.features_backfill("DISTRO_FEATURES", e.data))
+ e.data.appendVar('MACHINE_FEATURES', oe.utils.features_backfill("MACHINE_FEATURES", e.data))
if isinstance(e, bb.event.BuildStarted):
statuslines = []