summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-11 10:12:42 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-29 07:35:51 +0000
commit5b19b712526729e19c787fa68e0e5d8191988609 (patch)
tree2282b54f3cc399972cd428c846b2611d76e2e904 /bitbake/lib/bb
parentacc7b4d931f55477090f4143aed08415010fefca (diff)
downloadpoky-5b19b712526729e19c787fa68e0e5d8191988609.tar.gz
bitbake: bb/ui: Use getSetVariable command for BB_CONSOLELOG
Metadata can define BB_CONSOLELOG as containing ${DATETIME} and this can get expanded to a different value each time the variable is read. In the case of BB_CONSOLELOG, this behaviour is not desireable. The values of DATE/TIME are locked down at build time but this is too late for the purposes of ensuring the system can figure out the real value of BB_CONSOLELOG. The best way to do this is to set the variable into the datastore, thereby preserving its value. [YOCTO #8411] (Bitbake rev: 021f2eb55ab5863b57ed1b3f19f1b329bc1ad477) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/ui/knotty.py2
-rw-r--r--bitbake/lib/bb/ui/toasterui.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/ui/knotty.py b/bitbake/lib/bb/ui/knotty.py
index 2bee242eb0..90c3183767 100644
--- a/bitbake/lib/bb/ui/knotty.py
+++ b/bitbake/lib/bb/ui/knotty.py
@@ -230,7 +230,7 @@ def _log_settings_from_server(server):
230 if error: 230 if error:
231 logger.error("Unable to get the value of BBINCLUDELOGS_LINES variable: %s" % error) 231 logger.error("Unable to get the value of BBINCLUDELOGS_LINES variable: %s" % error)
232 raise BaseException(error) 232 raise BaseException(error)
233 consolelogfile, error = server.runCommand(["getVariable", "BB_CONSOLELOG"]) 233 consolelogfile, error = server.runCommand(["getSetVariable", "BB_CONSOLELOG"])
234 if error: 234 if error:
235 logger.error("Unable to get the value of BB_CONSOLELOG variable: %s" % error) 235 logger.error("Unable to get the value of BB_CONSOLELOG variable: %s" % error)
236 raise BaseException(error) 236 raise BaseException(error)
diff --git a/bitbake/lib/bb/ui/toasterui.py b/bitbake/lib/bb/ui/toasterui.py
index 0ed774ee7b..2b3bc3f436 100644
--- a/bitbake/lib/bb/ui/toasterui.py
+++ b/bitbake/lib/bb/ui/toasterui.py
@@ -55,7 +55,7 @@ def _log_settings_from_server(server):
55 if error: 55 if error:
56 logger.error("Unable to get the value of BBINCLUDELOGS_LINES variable: %s", error) 56 logger.error("Unable to get the value of BBINCLUDELOGS_LINES variable: %s", error)
57 raise BaseException(error) 57 raise BaseException(error)
58 consolelogfile, error = server.runCommand(["getVariable", "BB_CONSOLELOG"]) 58 consolelogfile, error = server.runCommand(["getSetVariable", "BB_CONSOLELOG"])
59 if error: 59 if error:
60 logger.error("Unable to get the value of BB_CONSOLELOG variable: %s", error) 60 logger.error("Unable to get the value of BB_CONSOLELOG variable: %s", error)
61 raise BaseException(error) 61 raise BaseException(error)