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 <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2020-08-25 10:54:14 +01:00
parent 8ce3e9a76d
commit ac3593f6ed

View File

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