From 4db8a3daafdedf39e081f4f6130f6cdcde03ed62 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 24 Jan 2013 17:52:56 +0000 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meta/classes/base.bbclass') 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 = [] -- cgit v1.2.3-54-g00ecf