From 4dd9ebd9480d2cce7c4149ff519c718f462a1acd Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 24 Aug 2020 17:42:20 +0100 Subject: bitbake: cooker: Ensure BB_ORIGENV is updated by changes to configuration.env Changes to configuration.env were not updating BB_ORIGENV, fix this. (Bitbake rev: c5fbd8452f87e0a2d234eaf27d0450aacdeb8891) Signed-off-by: Richard Purdie --- bitbake/lib/bb/cooker.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'bitbake/lib/bb/cooker.py') diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 99605e5844..754303813b 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -458,6 +458,12 @@ class BBCooker: bb.msg.loggerDefaultLogLevel = self.configuration.default_loglevel bb.msg.loggerDefaultDomains = self.configuration.debug_domains + if hasattr(self, "data"): + origenv = bb.data.init() + for k in environment: + origenv.setVar(k, environment[k]) + self.data.setVar("BB_ORIGENV", origenv) + for k in bb.utils.approved_variables(): if k in environment and k not in self.configuration.env: logger.debug(1, "Updating new environment variable %s to %s" % (k, environment[k])) -- cgit v1.2.3-54-g00ecf