Patchwork [bitbake-devel,1/1] bitbake: implement BB_VERBOSE_LOGS

login
register
mail settings
Submitter Paul Eggleton
Date Feb. 27, 2012, 2:06 p.m.
Message ID <fe2f1bcd135d8079b884c006daec70c4d282bc65.1330351287.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/22131/
State New
Headers show

Comments

Paul Eggleton - Feb. 27, 2012, 2:06 p.m.
Enable configuring whether "set +x" is added to all shell tasks rather
than forcing it; this is enabled by setting BB_VERBOSE_LOGS to 1.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 bitbake/lib/bb/build.py  |    3 ++-
 bitbake/lib/bb/cooker.py |    4 ++++
 bitbake/lib/bb/msg.py    |    5 ++++-
 3 files changed, 10 insertions(+), 2 deletions(-)
Paul Eggleton - Feb. 27, 2012, 2:08 p.m.
On Monday 27 February 2012 14:06:18 Paul Eggleton wrote:
> Enable configuring whether "set +x" is added to all shell tasks rather
> than forcing it; this is enabled by setting BB_VERBOSE_LOGS to 1.
> 
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> ---
>  bitbake/lib/bb/build.py  |    3 ++-
>  bitbake/lib/bb/cooker.py |    4 ++++
>  bitbake/lib/bb/msg.py    |    5 ++++-
>  3 files changed, 10 insertions(+), 2 deletions(-)
> 
> diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py
> index e85d7c4..37686f8 100644
> --- a/bitbake/lib/bb/build.py
> +++ b/bitbake/lib/bb/build.py
> @@ -221,9 +221,10 @@ def exec_func_shell(function, d, runfile, cwd=None):
> 
>      with open(runfile, 'w') as script:
>          script.write('#!/bin/sh -e\n')
> +        if bb.msg.loggerVerboseLogs:
> +            script.write("set -x\n")
>          data.emit_func(function, script, d)
> 
> -        script.write("set -x\n")
>          if cwd:
>              script.write("cd %s\n" % cwd)
>          script.write("%s\n" % function)
> diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
> index 12b526b..d3bdd17 100644
> --- a/bitbake/lib/bb/cooker.py
> +++ b/bitbake/lib/bb/cooker.py
> @@ -206,6 +206,10 @@ class BBCooker:
> 
>      def parseConfiguration(self):
> 
> +        # Set log file verbosity
> +        verboselogs =
> bb.utils.to_boolean(self.configuration.data.getVar("BB_VERBOSE_LOGS", "0"))
> +        if verboselogs:
> +            bb.msg.loggerVerboseLogs = True
> 
>          # Change nice level if we're asked to
>          nice = self.configuration.data.getVar("BB_NICE_LEVEL", True)
> diff --git a/bitbake/lib/bb/msg.py b/bitbake/lib/bb/msg.py
> index 20d9bdd..94865ee 100644
> --- a/bitbake/lib/bb/msg.py
> +++ b/bitbake/lib/bb/msg.py
> @@ -100,14 +100,17 @@ class BBLogFilter(object):
> 
>  loggerDefaultDebugLevel = 0
>  loggerDefaultVerbose = False
> +loggerVerboseLogs = False
>  loggerDefaultDomains = []
> 
> -def init_msgconfig(verbose, debug, debug_domains = []):
> +def init_msgconfig(verbose, debug, debug_domains = [], verboselogsonly =
> False): """

Whoops, this crept in from an earlier version. v2 on the way.

Cheers,
Paul

Patch

diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py
index e85d7c4..37686f8 100644
--- a/bitbake/lib/bb/build.py
+++ b/bitbake/lib/bb/build.py
@@ -221,9 +221,10 @@  def exec_func_shell(function, d, runfile, cwd=None):
 
     with open(runfile, 'w') as script:
         script.write('#!/bin/sh -e\n')
+        if bb.msg.loggerVerboseLogs:
+            script.write("set -x\n")
         data.emit_func(function, script, d)
 
-        script.write("set -x\n")
         if cwd:
             script.write("cd %s\n" % cwd)
         script.write("%s\n" % function)
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 12b526b..d3bdd17 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -206,6 +206,10 @@  class BBCooker:
 
     def parseConfiguration(self):
 
+        # Set log file verbosity
+        verboselogs = bb.utils.to_boolean(self.configuration.data.getVar("BB_VERBOSE_LOGS", "0"))
+        if verboselogs:
+            bb.msg.loggerVerboseLogs = True
 
         # Change nice level if we're asked to
         nice = self.configuration.data.getVar("BB_NICE_LEVEL", True)
diff --git a/bitbake/lib/bb/msg.py b/bitbake/lib/bb/msg.py
index 20d9bdd..94865ee 100644
--- a/bitbake/lib/bb/msg.py
+++ b/bitbake/lib/bb/msg.py
@@ -100,14 +100,17 @@  class BBLogFilter(object):
 
 loggerDefaultDebugLevel = 0
 loggerDefaultVerbose = False
+loggerVerboseLogs = False
 loggerDefaultDomains = []
 
-def init_msgconfig(verbose, debug, debug_domains = []):
+def init_msgconfig(verbose, debug, debug_domains = [], verboselogsonly = False):
     """
     Set default verbosity and debug levels config the logger
     """
     bb.msg.loggerDefaultDebugLevel = debug
     bb.msg.loggerDefaultVerbose = verbose
+    if verbose:
+        bb.msg.loggerVerboseLogs = True
     bb.msg.loggerDefaultDomains = debug_domains
 
 def addDefaultlogFilter(handler):