summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-24 17:52:56 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-24 20:08:59 (GMT)
commit4db8a3daafdedf39e081f4f6130f6cdcde03ed62 (patch)
treef3a9ca7a3fe7a705fcb2e531e09c1d7f18115468
parentc98363450fc4ccab82b34a37a95bd172cf6e115f (diff)
downloadpoky-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>
-rw-r--r--meta/classes/base.bbclass2
-rw-r--r--meta/conf/bitbake.conf3
2 files changed, 2 insertions, 3 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() {
314 generate_git_config(e) 314 generate_git_config(e)
315 pkgarch_mapping(e.data) 315 pkgarch_mapping(e.data)
316 preferred_ml_updates(e.data) 316 preferred_ml_updates(e.data)
317 e.data.appendVar('DISTRO_FEATURES', oe.utils.features_backfill("DISTRO_FEATURES", e.data))
318 e.data.appendVar('MACHINE_FEATURES', oe.utils.features_backfill("MACHINE_FEATURES", e.data))
317 319
318 if isinstance(e, bb.event.BuildStarted): 320 if isinstance(e, bb.event.BuildStarted):
319 statuslines = [] 321 statuslines = []
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 607fb70..13a3ff9 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -739,10 +739,7 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
739IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}" 739IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}"
740 740
741DISTRO_FEATURES_BACKFILL = "pulseaudio ${DISTRO_FEATURES_INITMAN}" 741DISTRO_FEATURES_BACKFILL = "pulseaudio ${DISTRO_FEATURES_INITMAN}"
742DISTRO_FEATURES_append = "${@oe.utils.features_backfill("DISTRO_FEATURES",d)}"
743
744MACHINE_FEATURES_BACKFILL = "rtc" 742MACHINE_FEATURES_BACKFILL = "rtc"
745MACHINE_FEATURES_append = "${@oe.utils.features_backfill("MACHINE_FEATURES",d)}"
746 743
747COMBINED_FEATURES = "\ 744COMBINED_FEATURES = "\
748 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "alsa", d)} \ 745 ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "alsa", d)} \