classes/base: fix die() to print the full log

The recent change to connect through the shell logging functions caused
a regression - bb.error() and bb.fatal() cause a flag to be set
internally such that BitBake's UI will not print the full task log on
failure; unfortunately we have in a lot of places called die() or
bbfatal() within shell functions with a very terse message as a means of
exiting out, where we still want to see the full log (and we were
previously). We do still want to have fatal errors with proper messages
that don't result in the full log being printed, however we can't ignore
the typical usage of die(). Having added a mechanism to BitBake to log an
error and reset the flag, create a bbfatal_log() function that uses this
and call it from die() to restore the previous behaviour.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index e5417897d0801fb932acb6163998747a4445d7f1..e0f105316441db63eb4041c44f29185da1fca922 100644 (file)
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -47,7 +47,7 @@ def lsb_distro_identifier(d):
     return oe.lsb.distro_identifier(adjust_func)
 
 die() {
-       bbfatal "$*"
+       bbfatal_log "$*"
 }
 
 oe_runmake_call() {

diff --git a/meta/classes/logging.bbclass b/meta/classes/logging.bbclass
index f19edddde5ee2b60967750dd4f4725a2ecfee8a8..6b24839af517f7596f6bd6d9f11912c97b2a9967 100644 (file)
--- a/meta/classes/logging.bbclass
+++ b/meta/classes/logging.bbclass
@@ -40,6 +40,14 @@ bbfatal() {
        exit 1
 }
 
+# Like bbfatal, except prevents the suppression of the error log by
+# bitbake's UI.
+# Output: logs console
+bbfatal_log() {
+       printf "%b\0" "bbfatal_log $*" > ${LOGFIFO}
+       exit 1
+}
+
 # Print debug messages. These are appropriate for progress checkpoint
 # messages to the logs. Depending on the debug log level, they may also
 # go to the console.