From cefd312541019c1bb0132f41334df58971fd81ef Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 2 Mar 2018 18:17:40 +0000 Subject: base: Handle backfilling in anonymous python code, not event handler Handling of backfilling is trickier than you'd think. We need this to execute early enough that the user will see the changes in bitbake -e and other output yet late enough that the virtclass extensions have changed the tunes before it executes. It makes more sense to execute this at anonymous python time now bitbake -e correctly handles this and that unbreaks multilib corruption of these variables. [YOCTO #12373] Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'meta/classes/base.bbclass') diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index b0a72c7a90..e0b76f0510 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -222,8 +222,6 @@ python base_eventhandler() { if not d.getVar("NATIVELSBSTRING", False): d.setVar("NATIVELSBSTRING", lsb_distro_identifier(d)) d.setVar('BB_VERSION', bb.__version__) - oe.utils.features_backfill("DISTRO_FEATURES", d) - oe.utils.features_backfill("MACHINE_FEATURES", d) # Works with the line in layer.conf which changes PATH to point here setup_hosttools_dir(d.getVar('HOSTTOOLS_DIR'), 'HOSTTOOLS', d) setup_hosttools_dir(d.getVar('HOSTTOOLS_DIR'), 'HOSTTOOLS_NONFATAL', d, fatal=False) @@ -382,6 +380,10 @@ def set_packagetriplet(d): python () { import string, re + # Handle backfilling + oe.utils.features_backfill("DISTRO_FEATURES", d) + oe.utils.features_backfill("MACHINE_FEATURES", d) + # Handle PACKAGECONFIG # # These take the form: -- cgit 1.2.3-korg