helium-3rd-party/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky synced 2026-08-12 18:48:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

bitbake: cooker: Fix environment double key expansion issue

Browse Source 
The base configuration needs key expansion and anon python execution,
the parsed configurations do not. Fix this consistently, its been
broken and causing double key expansion for a while, only relised
when we started double anonymous python exeution too.

(Bitbake rev: 6138897de5ac6becf3bff56ce7a78f3ec208fcdf)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2018-03-03 23:28:08 +00:00
parent c2381e3a69
commit 4e884c8723
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bitbake/lib/bb/cooker.py
View File

@ -516,6 +516,8 @@ class BBCooker:
fn = runlist[0][3]
else:
envdata = self.data
data.expandKeys(envdata)
parse.ast.runAnonFuncs(envdata)
if fn:
try:
@ -530,9 +532,6 @@ 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)