summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-24 17:42:20 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-25 18:14:53 +0100
commit4dd9ebd9480d2cce7c4149ff519c718f462a1acd (patch)
tree49bafa34c6ef040d0d025aaebf55bfe0a5b3ef5a /bitbake
parentb9bbb5c7b7ea010a098e19c8da34fd5ea667a39f (diff)
downloadpoky-4dd9ebd9480d2cce7c4149ff519c718f462a1acd.tar.gz
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/cooker.py6
1 files changed, 6 insertions, 0 deletions
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:
458 bb.msg.loggerDefaultLogLevel = self.configuration.default_loglevel 458 bb.msg.loggerDefaultLogLevel = self.configuration.default_loglevel
459 bb.msg.loggerDefaultDomains = self.configuration.debug_domains 459 bb.msg.loggerDefaultDomains = self.configuration.debug_domains
460 460
461 if hasattr(self, "data"):
462 origenv = bb.data.init()
463 for k in environment:
464 origenv.setVar(k, environment[k])
465 self.data.setVar("BB_ORIGENV", origenv)
466
461 for k in bb.utils.approved_variables(): 467 for k in bb.utils.approved_variables():
462 if k in environment and k not in self.configuration.env: 468 if k in environment and k not in self.configuration.env:
463 logger.debug(1, "Updating new environment variable %s to %s" % (k, environment[k])) 469 logger.debug(1, "Updating new environment variable %s to %s" % (k, environment[k]))