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: 45b4597db37e3ad50ff84cda39fd14a25d6d2680)

Signed-off-by: Stefan Wiehler <stefan.wiehler@nokia.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 83a6f28d2e464f00202090e998a63045adba9e4e)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 8 insertions, 0 deletions

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 4cb638864c..afccffcf17 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -310,6 +310,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() {
@@ -339,6 +341,8 @@ do_patch() {
                         fi
                 done
         fi
+
+        set -e
 }
 
 do_kernel_checkout() {
@@ -397,6 +401,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} ${WORKDIR}"
 
@@ -691,6 +697,8 @@ do_validate_branches() {
                         kgit-s2q --clean
                 fi
         fi
+
+        set -e
 }
 
 OE_TERMINAL_EXPORTS += "KBUILD_OUTPUT"