diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-24 17:52:56 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-24 20:07:59 +0000 |
| commit | 22429cdf79ed952072707a929643c7386fa7e056 (patch) | |
| tree | 156d7efd97690339a61ad7477601df9d79b71fd1 | |
| parent | 211e473432230765a48d7af9c66c8737a08cdec7 (diff) | |
| download | openembedded-core-22429cdf79ed952072707a929643c7386fa7e056.tar.gz openembedded-core-22429cdf79ed952072707a929643c7386fa7e056.tar.bz2 openembedded-core-22429cdf79ed952072707a929643c7386fa7e056.zip | |
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>
| -rw-r--r-- | meta/classes/base.bbclass | 2 | ||||
| -rw-r--r-- | meta/conf/bitbake.conf | 3 |
2 files changed, 2 insertions, 3 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 = [] diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 607fb70243..13a3ff9a3d 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -739,10 +739,7 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}" DISTRO_FEATURES_BACKFILL = "pulseaudio ${DISTRO_FEATURES_INITMAN}" -DISTRO_FEATURES_append = "${@oe.utils.features_backfill("DISTRO_FEATURES",d)}" - MACHINE_FEATURES_BACKFILL = "rtc" -MACHINE_FEATURES_append = "${@oe.utils.features_backfill("MACHINE_FEATURES",d)}" COMBINED_FEATURES = "\ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "alsa", d)} \ |