From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] toolchain/helpers: make sure we bail out when kernel headers check fails
Date: Tue, 12 Nov 2019 21:21:17 +0100 [thread overview]
Message-ID: <20191112202118.56136-1-thomas.petazzoni@bootlin.com> (raw)
In commit 6136765b23abd9faba610dd54ed276a777811575 ("toolchain:
generate check-headers program under $(BUILD_DIR)"), the
check_kernel_headers_version function was simplified to not check the
return value of the check-kernel-headers.sh script, assuming that
"make" does bail out on the first failing command.
However, check_kernel_headers_version when used in $(2)_CONFIGURE_CMDS
from pkg-toolchain-external.mk, is called in a sequence of commands,
where the return value of each command is not checked. Therefore, a
failure of check-kernel-headers.sh no longer aborts the build.
Since all other macros are using this principle of calling "exit 1",
we revert back to the same for check_kernel_headers_version, as it was
done prior to 6136765b23abd9faba610dd54ed276a777811575.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Cc: Carlos Santos <unixmania@gmail.com>
---
toolchain/helpers.mk | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 42e5522060..996cc70d44 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -163,7 +163,9 @@ copy_toolchain_sysroot = \
# $3: kernel version string, in the form: X.Y
#
check_kernel_headers_version = \
- support/scripts/check-kernel-headers.sh $(1) $(2) $(3)
+ if ! support/scripts/check-kernel-headers.sh $(1) $(2) $(3); then \
+ exit 1; \
+ fi
#
# Check the specific gcc version actually matches the version in the
--
2.23.0
next reply other threads:[~2019-11-12 20:21 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-12 20:21 Thomas Petazzoni [this message]
2019-11-12 21:21 ` [Buildroot] [PATCH] toolchain/helpers: make sure we bail out when kernel headers check fails Carlos Santos
2019-11-12 21:25 ` Thomas Petazzoni
2019-11-12 21:30 ` Carlos Santos
2019-11-13 21:41 ` Yann E. MORIN
2019-11-19 7:55 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191112202118.56136-1-thomas.petazzoni@bootlin.com \
--to=thomas.petazzoni@bootlin.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox