bitbake: 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.

(Bitbake rev: bcdc2f73e3b4a10b1e479c2891f251d9507a9e30)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2018-03-02 18:17:05 +00:00
parent 20a93757a3
commit c2381e3a69

View File

@@ -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))