From c1ea152c08cea947173a61937689a22791f7b4b5 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 20 Jun 2013 16:48:23 +0100 Subject: base.bbclass: Ensure finalised data is displayed in build banner The build banner displayed at the start of builds can be misleading since the data store has not been finalised. As easy way to illustrate this is to use something like: DEFAULTTUNE = "i586" DEFAULTTUNE_ = "core2" and the banner will display the i586 tune yet the core2 tune will be used. We can avoid this if we finalise a copy of the data before displaying it. [YOCTO #4225] (From OE-Core master rev: bdce39f22a0e8c8e1cf237322657220e4201077d) (From OE-Core rev: 3f6c1307e1ad2d3ca3fd53bfb7f2a5eac31bee33) Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'meta') diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 641316d1fa..1ca7d663d7 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -308,13 +308,15 @@ python base_eventhandler() { oe.utils.features_backfill("MACHINE_FEATURES", e.data) if isinstance(e, bb.event.BuildStarted): + localdata = bb.data.createCopy(e.data) + bb.data.update_data(localdata) statuslines = [] - for func in oe.data.typed_value('BUILDCFG_FUNCS', e.data): + for func in oe.data.typed_value('BUILDCFG_FUNCS', localdata): g = globals() if func not in g: bb.warn("Build configuration function '%s' does not exist" % func) else: - flines = g[func](e.data) + flines = g[func](localdata) if flines: statuslines.extend(flines) -- cgit v1.2.3-54-g00ecf