diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-07-13 16:20:03 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-16 15:09:23 +0100 |
commit | ddc1df3e80b2c42a2bda7ddab8fd26c367290c99 (patch) | |
tree | 22f7986569484fb269059b66b9b0d6d0f834bd8a /meta/classes/scons.bbclass | |
parent | 757be608a5538bc4f32d234f216d24d4caa6539b (diff) | |
download | poky-ddc1df3e80b2c42a2bda7ddab8fd26c367290c99.tar.gz |
Use die() or bbfatal_log() where the log should definitely be printed
Change calls to bbfatal() to either die() or bbfatal_log() where we know
we want the full log to be printed by the UI (calling bberror or bbfatal
would otherwise suppress it since the change to connect these functions
through to the UI.) bbfatal() is still fine to use where there is enough
context information in the message such that the log isn't needed.
(From OE-Core rev: 04ed9a19e1b08003329138b8ab83691d13c11fd9)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/scons.bbclass')
-rw-r--r-- | meta/classes/scons.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/scons.bbclass b/meta/classes/scons.bbclass index fc0f26b17b..b8de822ff7 100644 --- a/meta/classes/scons.bbclass +++ b/meta/classes/scons.bbclass | |||
@@ -4,12 +4,12 @@ EXTRA_OESCONS ?= "" | |||
4 | 4 | ||
5 | scons_do_compile() { | 5 | scons_do_compile() { |
6 | ${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} || \ | 6 | ${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} || \ |
7 | bbfatal "scons build execution failed." | 7 | die "scons build execution failed." |
8 | } | 8 | } |
9 | 9 | ||
10 | scons_do_install() { | 10 | scons_do_install() { |
11 | ${STAGING_BINDIR_NATIVE}/scons PREFIX=${D}${prefix} prefix=${D}${prefix} install ${EXTRA_OESCONS}|| \ | 11 | ${STAGING_BINDIR_NATIVE}/scons PREFIX=${D}${prefix} prefix=${D}${prefix} install ${EXTRA_OESCONS}|| \ |
12 | bbfatal "scons install execution failed." | 12 | die "scons install execution failed." |
13 | } | 13 | } |
14 | 14 | ||
15 | EXPORT_FUNCTIONS do_compile do_install | 15 | EXPORT_FUNCTIONS do_compile do_install |