summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Wiehler <stefan.wiehler@nokia.com>2022-06-02 11:45:14 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-06-04 11:28:23 +0100
commitdcb85d7dd59b3c24e05e8ba50c0f3093e815d305 (patch)
tree544f0b7c4de0445c05874e66cb6f02b4f6b4a11d
parent27e4b90518be7849fc7dbedcc70763d6c3bc73d5 (diff)
downloadpoky-dcb85d7dd59b3c24e05e8ba50c0f3093e815d305.tar.gz
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: 83a6f28d2e464f00202090e998a63045adba9e4e) Signed-off-by: Stefan Wiehler <stefan.wiehler@nokia.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel-yocto.bbclass8
1 files changed, 8 insertions, 0 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index b276ded775..ce1446f7aa 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -310,6 +310,8 @@ do_kernel_metadata() {
310 bbnote "KERNEL_FEATURES: $KERNEL_FEATURES_FINAL" 310 bbnote "KERNEL_FEATURES: $KERNEL_FEATURES_FINAL"
311 bbnote "Final scc/cfg list: $sccs_defconfig $bsp_definition $sccs $KERNEL_FEATURES_FINAL" 311 bbnote "Final scc/cfg list: $sccs_defconfig $bsp_definition $sccs $KERNEL_FEATURES_FINAL"
312 fi 312 fi
313
314 set -e
313} 315}
314 316
315do_patch() { 317do_patch() {
@@ -343,6 +345,8 @@ do_patch() {
343 fi 345 fi
344 done 346 done
345 fi 347 fi
348
349 set -e
346} 350}
347 351
348do_kernel_checkout() { 352do_kernel_checkout() {
@@ -401,6 +405,8 @@ do_kernel_checkout() {
401 git commit -q -m "baseline commit: creating repo for ${PN}-${PV}" 405 git commit -q -m "baseline commit: creating repo for ${PN}-${PV}"
402 git clean -d -f 406 git clean -d -f
403 fi 407 fi
408
409 set -e
404} 410}
405do_kernel_checkout[dirs] = "${S} ${WORKDIR}" 411do_kernel_checkout[dirs] = "${S} ${WORKDIR}"
406 412
@@ -695,6 +701,8 @@ do_validate_branches() {
695 kgit-s2q --clean 701 kgit-s2q --clean
696 fi 702 fi
697 fi 703 fi
704
705 set -e
698} 706}
699 707
700OE_TERMINAL_EXPORTS += "KBUILD_OUTPUT" 708OE_TERMINAL_EXPORTS += "KBUILD_OUTPUT"