From 8a382d8655342d70b0146adf90e9e0489234b52c Mon Sep 17 00:00:00 2001 From: Stefan Wiehler Date: Thu, 2 Jun 2022 11:45:14 +0200 Subject: [PATCH] kernel-yocto.bbclass: Reset to exiting on non-zero return code at end of task Several tasks deactivate exiting on non-zero return codes via set +e because they run subcommands that have legitimate non-zero return codes. However when appending to those tasks, this behavior is not expected and can lead to builds silently proceeding in case of an error. Therefore reset the default behavior at the end of the respective tasks via set -e. (From OE-Core rev: 7777cc853db7200b819095be6f6a3561738ac94d) Signed-off-by: Stefan Wiehler Signed-off-by: Richard Purdie (cherry picked from commit 83a6f28d2e464f00202090e998a63045adba9e4e) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index a1a073b738..2a6231803b 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -269,6 +269,8 @@ do_kernel_metadata() { bbnote "KERNEL_FEATURES: $KERNEL_FEATURES_FINAL" bbnote "Final scc/cfg list: $sccs_defconfig $bsp_definition $sccs $KERNEL_FEATURES_FINAL" fi + + set -e } do_patch() { @@ -298,6 +300,8 @@ do_patch() { fi done fi + + set -e } do_kernel_checkout() { @@ -356,6 +360,8 @@ do_kernel_checkout() { git commit -q -m "baseline commit: creating repo for ${PN}-${PV}" git clean -d -f fi + + set -e } do_kernel_checkout[dirs] = "${S}" @@ -523,6 +529,8 @@ do_validate_branches() { kgit-s2q --clean fi fi + + set -e } OE_TERMINAL_EXPORTS += "KBUILD_OUTPUT"