diff options
| author | Yann E. MORIN <yann.morin.1998@free.fr> | 2017-01-28 11:41:32 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2017-03-31 09:09:46 +0200 |
| commit | e29fa95b8368f9b85a1bfb2cef9741c6218c59b3 (patch) | |
| tree | 2081ba208db9e1a220b663b879df699aff58e22b /support/scripts | |
| parent | 74ed2a833da74b33e0ad8c4fd77e789885b3a9fd (diff) | |
| download | buildroot-e29fa95b8368f9b85a1bfb2cef9741c6218c59b3.tar.gz buildroot-e29fa95b8368f9b85a1bfb2cef9741c6218c59b3.zip | |
core/br2-external: properly report unexpected errors
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>
(cherry picked from commit c5fa9308ea4e3810a7f7d9d0df75cbf090c414c4)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'support/scripts')
| -rwxr-xr-x | support/scripts/br2-external | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/support/scripts/br2-external b/support/scripts/br2-external index 26bcac8aa1..7e816081a1 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} |
