From ac3593f6ed8f2ffb0bb62df47220b598cc1781f6 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 25 Aug 2020 10:54:14 +0100 Subject: bitbake: cooker: Ensure cooker's enviroment is updated on updateConfig Only the env variables which were added to the datastore were being updated. We need to update the whole copy, we just only trigger a reparse if any of the variables making it into the datastore change. This avoids a bug where variables such as DISPLAY in a new UI context would break under memory resident bitbake. (Bitbake rev: 4bb71b627767297269e762b414443e15e28bfac4) Signed-off-by: Richard Purdie --- bitbake/lib/bb/cooker.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'bitbake/lib') diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 754303813b..fc017dd19f 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -479,6 +479,10 @@ class BBCooker: logger.debug(1, "Updating environment variable %s from %s to %s" % (k, self.configuration.env[k], environment[k])) self.configuration.env[k] = environment[k] clean = False + + # Now update all the variables not in the datastore to match + self.configuration.env = environment + if not clean: logger.debug(1, "Base environment change, triggering reparse") self.reset() -- cgit v1.2.3-54-g00ecf