summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann E. MORIN <yann.morin.1998@free.fr>2017-01-28 10:41:32 (GMT)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-03-26 21:44:04 (GMT)
commitc5fa9308ea4e3810a7f7d9d0df75cbf090c414c4 (patch)
treea75c89b705cefccd62d4e52d903364caec8f48bc
parentf30a3940c8dc5fc9bbe3a0ace457201808142183 (diff)
downloadbuildroot-master.tar.gz
buildroot-master.tar.bz2
core/br2-external: properly report unexpected errorsHEADmaster
Unextected error in the br2-external script are properly caught, but they are not reported properly, and we end up in either of two situations: - the .br2-external.mk file is not generated, in which case make will try to find a rule to generate it (because the 'include' directive tries to generate missing files); - the .br-external.mk file is generated but does not contain the error variable, and thus the build might not get interrupted. We fix that by using a trap on the pseudo ERR signal, to emit the error variable on unexpected errors. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rwxr-xr-xsupport/scripts/br2-external3
1 files changed, 3 insertions, 0 deletions
diff --git a/support/scripts/br2-external b/support/scripts/br2-external
index 26bcac8..7e81608 100755
--- a/support/scripts/br2-external
+++ b/support/scripts/br2-external
@@ -40,6 +40,9 @@ main() {
exec >"${ofile}"
+ # Trap any unexpected error to generate a meaningful error message
+ trap "error 'unexpected error while generating ${ofile}\n'" ERR
+
do_validate ${@//:/ }
do_${ofmt}