toolchain/helpers: make sure we bail out when kernel headers check fails
PATCH 1/1 toolchain/helpers: make sure we bail out when kernel headers check fails
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.
--- toolchain/helpers.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
toolchain/helpers.mk +3 -1
@@ -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
Signature · 1 line
2.23.0
PATCH 1/1 toolchain/helpers: make sure we bail out when kernel headers check fails
Quoted 38 lines · Thomas Petazzoni
In commit
6136765b23abd9faba610dd54ed276a777811575("toolchain:
generate check-headers program under $(BUILD_DIR)"), thecheck_kernel_headers_versionfunction was simplified to not check the return value of thecheck-kernel-headers.shscript, assuming that "make" does bail out on the first failing command.However,
check_kernel_headers_versionwhen 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 ofcheck-kernel-headers.shno 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 to6136765b23abd9faba610dd54ed276a777811575.Signed-off-by Thomas Petazzoni <[email protected]>Cc Carlos Santos <[email protected]>--- toolchain/helpers.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)toolchain/helpers.mk +3
-2@@ -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 --
Quoted 2 lines
2.23.0
The function became a one-liner after commit 6136765b23. Wouldn't it be simpler and more readable to run the script and test the result, both in linux-headers.mk and pkg-toolchain-external.mk?
Signature · 1 line
Carlos Santos <[email protected]>
PATCH 1/1 toolchain/helpers: make sure we bail out when kernel headers check fails
Quoted 13 lines · On Tue, 12 Nov 2019 18:21:15 -0300 Carlos Santos <[email protected]> wrote:
Quoted 13 lines
toolchain/helpers.mk +3
-1@@ -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
Quoted 9 lines
Quoted 5 lines
toolchain/helpers.mk +0
-1# # Check the specific gcc version actually matches the version in the --2.23.0
The function became a one-liner after commit
6136765b23. Wouldn't it be simpler and more readable to run the script and test the result, both in linux-headers.mk and pkg-toolchain-external.mk?
Yes, we could certainly do that. The aim of my patch was really just to get back to where we were before, to fix the immediate issue. This of course doesn't mean we can't improve things further.
I'll let Peter/Arnout/Yann decide what they want to do (i.e apply my patch as-is, or have a more elaborate version).
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 toolchain/helpers: make sure we bail out when kernel headers check fails
Quoted 34 lines · Thomas Petazzoni
Quoted 13 lines · On Tue, 12 Nov 2019 18:21:15 -0300 Carlos Santos <[email protected]> wrote:
Quoted 13 lines
toolchain/helpers.mk +3
-1@@ -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; \ + fiQuoted 9 lines
Quoted 5 lines
toolchain/helpers.mk +0
-1# # Check the specific gcc version actually matches the version in the --2.23.0
The function became a one-liner after commit
6136765b23. Wouldn't it be simpler and more readable to run the script and test the result, both in linux-headers.mk and pkg-toolchain-external.mk?Yes, we could certainly do that. The aim of my patch was really just to get back to where we were before, to fix the immediate issue. This of course doesn't mean we can't improve things further.
I'll let Peter/Arnout/Yann decide what they want to do (i.e apply my patch as-is, or have a more elaborate version).
Quoted 7 lines
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Hum, perhaps we should keep the design pattern, considering that other functions (e.g. check_gcc_version) are used the same way, so
Yann E. MORIN
AppliedPATCH 1/1 toolchain/helpers: make sure we bail out when kernel headers check fails
In reply to Thomas PetazzoniThomas, All,
On 2019-11-12 21:21 +0100, Thomas Petazzoni spake thusly:
Quoted 11 lines
In commit
6136765b23abd9faba610dd54ed276a777811575("toolchain:
generate check-headers program under $(BUILD_DIR)"), thecheck_kernel_headers_versionfunction was simplified to not check the return value of thecheck-kernel-headers.shscript, assuming that "make" does bail out on the first failing command.However,
check_kernel_headers_versionwhen 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 ofcheck-kernel-headers.shno longer aborts the build.
Quoted 6 lines
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 to6136765b23abd9faba610dd54ed276a777811575.Signed-off-by Thomas Petazzoni <[email protected]>Cc Carlos Santos <[email protected]>
Applied to master, thanks.
Regards,
Yann E. MORIN.
Quoted 26 lines
--- toolchain/helpers.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)toolchain/helpers.mk +3
-1@@ -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 theSignature · 6 lines
2.23.0 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 1/1 toolchain/helpers: make sure we bail out when kernel headers check fails
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
Hi,
Quoted 12 lines
On 2019-11-12 21:21 +0100, Thomas Petazzoni spake thusly:
Quoted 11 lines
In commit
6136765b23abd9faba610dd54ed276a777811575("toolchain:
generate check-headers program under $(BUILD_DIR)"), thecheck_kernel_headers_versionfunction was simplified to not check the return value of thecheck-kernel-headers.shscript, assuming that "make" does bail out on the first failing command.However,
check_kernel_headers_versionwhen 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 ofcheck-kernel-headers.shno longer aborts the build.
Quoted 8 lines
Quoted 6 lines
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 to6136765b23abd9faba610dd54ed276a777811575.Signed-off-by Thomas Petazzoni <[email protected]>Cc Carlos Santos <[email protected]>Applied to master, thanks.
Committed to 2019.02.x and 2019.08.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard