From 4e884c8723cf2e3e89d6ac412fb472e64e51bac1 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 3 Mar 2018 23:28:08 +0000 Subject: bitbake: cooker: Fix environment double key expansion issue 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 --- bitbake/lib/bb/cooker.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'bitbake/lib/bb/cooker.py') diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index d1df711d40..1fda40dd41 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -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) -- cgit v1.2.3-54-g00ecf