summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-02 18:17:40 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-04 11:35:42 +0000
commitbe4c9df542ef53be4169396517aef0b3873e850b (patch)
tree599a4f9bb5d0202536794c09865540a77c40b21b /meta/classes
parent49f7c2cd87adafb2130addedf69d5f67dc1f2a22 (diff)
downloadpoky-be4c9df542ef53be4169396517aef0b3873e850b.tar.gz
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] (From OE-Core rev: cefd312541019c1bb0132f41334df58971fd81ef) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/base.bbclass6
1 files changed, 4 insertions, 2 deletions
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() {
222 if not d.getVar("NATIVELSBSTRING", False): 222 if not d.getVar("NATIVELSBSTRING", False):
223 d.setVar("NATIVELSBSTRING", lsb_distro_identifier(d)) 223 d.setVar("NATIVELSBSTRING", lsb_distro_identifier(d))
224 d.setVar('BB_VERSION', bb.__version__) 224 d.setVar('BB_VERSION', bb.__version__)
225 oe.utils.features_backfill("DISTRO_FEATURES", d)
226 oe.utils.features_backfill("MACHINE_FEATURES", d)
227 # Works with the line in layer.conf which changes PATH to point here 225 # Works with the line in layer.conf which changes PATH to point here
228 setup_hosttools_dir(d.getVar('HOSTTOOLS_DIR'), 'HOSTTOOLS', d) 226 setup_hosttools_dir(d.getVar('HOSTTOOLS_DIR'), 'HOSTTOOLS', d)
229 setup_hosttools_dir(d.getVar('HOSTTOOLS_DIR'), 'HOSTTOOLS_NONFATAL', d, fatal=False) 227 setup_hosttools_dir(d.getVar('HOSTTOOLS_DIR'), 'HOSTTOOLS_NONFATAL', d, fatal=False)
@@ -382,6 +380,10 @@ def set_packagetriplet(d):
382python () { 380python () {
383 import string, re 381 import string, re
384 382
383 # Handle backfilling
384 oe.utils.features_backfill("DISTRO_FEATURES", d)
385 oe.utils.features_backfill("MACHINE_FEATURES", d)
386
385 # Handle PACKAGECONFIG 387 # Handle PACKAGECONFIG
386 # 388 #
387 # These take the form: 389 # These take the form: