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:08:59 +0000 |
| commit | 4db8a3daafdedf39e081f4f6130f6cdcde03ed62 (patch) | |
| tree | f3a9ca7a3fe7a705fcb2e531e09c1d7f18115468 /meta/classes | |
| parent | c98363450fc4ccab82b34a37a95bd172cf6e115f (diff) | |
| download | ast2050-yocto-poky-4db8a3daafdedf39e081f4f6130f6cdcde03ed62.zip ast2050-yocto-poky-4db8a3daafdedf39e081f4f6130f6cdcde03ed62.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.
(From OE-Core rev: 22429cdf79ed952072707a929643c7386fa7e056)
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')
| -rw-r--r-- | meta/classes/base.bbclass | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index b427a5e..dafded3 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 = [] |
