aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-02 18:17:05 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-03 08:44:22 +0000
commitbcdc2f73e3b4a10b1e479c2891f251d9507a9e30 (patch)
treea7b7ddfc1a31936fe201dc70f11428d59fac17ad
parentc6be487f9bd5d95915f2495d555b9f539adb1d44 (diff)
downloadbitbake-bcdc2f73e3b4a10b1e479c2891f251d9507a9e30.zip
bitbake-bcdc2f73e3b4a10b1e479c2891f251d9507a9e30.tar.gz
bitbake-bcdc2f73e3b4a10b1e479c2891f251d9507a9e30.tar.bz2
cooker: Run registered anonymous python before displaying environment
The output of bitbake -e can differ from what actually is used due to anonymous python making changes to the data store. Execute any anonymous python added in the base configuration to make things more consistent. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/cooker.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index af482f9..d1df711 100644
--- a/lib/bb/cooker.py
+++ b/lib/bb/cooker.py
@@ -530,13 +530,15 @@ class BBCooker:
self.data.inchistory.emit(env)
logger.plain(env.getvalue())
+ data.expandKeys(envdata)
+ parse.ast.runAnonFuncs(envdata)
+
# emit variables and shell functions
with closing(StringIO()) as env:
data.emit_env(env, envdata, True)
logger.plain(env.getvalue())
# emit the metadata which isnt valid shell
- data.expandKeys(envdata)
for e in sorted(envdata.keys()):
if envdata.getVarFlag(e, 'func', False) and envdata.getVarFlag(e, 'python', False):
logger.plain("\npython %s () {\n%s}\n", e, envdata.getVar(e, False))