summaryrefslogtreecommitdiffstats
path: root/meta
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-22 23:46:32 +0100
commit8a382d8655342d70b0146adf90e9e0489234b52c (patch)
tree379f37d3034959e272641fc0c32af33e0e73456d /meta
parent8d6f9680e45d6513349ecc98a0d44b9e67a1a11a (diff)
downloadpoky-8a382d8655342d70b0146adf90e9e0489234b52c.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: 7777cc853db7200b819095be6f6a3561738ac94d) 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>
Diffstat (limited to 'meta')
-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 a1a073b738..2a6231803b 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -269,6 +269,8 @@ do_kernel_metadata() {
269 bbnote "KERNEL_FEATURES: $KERNEL_FEATURES_FINAL" 269 bbnote "KERNEL_FEATURES: $KERNEL_FEATURES_FINAL"
270 bbnote "Final scc/cfg list: $sccs_defconfig $bsp_definition $sccs $KERNEL_FEATURES_FINAL" 270 bbnote "Final scc/cfg list: $sccs_defconfig $bsp_definition $sccs $KERNEL_FEATURES_FINAL"
271 fi 271 fi
272
273 set -e
272} 274}
273 275
274do_patch() { 276do_patch() {
@@ -298,6 +300,8 @@ do_patch() {
298 fi 300 fi
299 done 301 done
300 fi 302 fi
303
304 set -e
301} 305}
302 306
303do_kernel_checkout() { 307do_kernel_checkout() {
@@ -356,6 +360,8 @@ do_kernel_checkout() {
356 git commit -q -m "baseline commit: creating repo for ${PN}-${PV}" 360 git commit -q -m "baseline commit: creating repo for ${PN}-${PV}"
357 git clean -d -f 361 git clean -d -f
358 fi 362 fi
363
364 set -e
359} 365}
360do_kernel_checkout[dirs] = "${S}" 366do_kernel_checkout[dirs] = "${S}"
361 367
@@ -523,6 +529,8 @@ do_validate_branches() {
523 kgit-s2q --clean 529 kgit-s2q --clean
524 fi 530 fi
525 fi 531 fi
532
533 set -e
526} 534}
527 535
528OE_TERMINAL_EXPORTS += "KBUILD_OUTPUT" 536OE_TERMINAL_EXPORTS += "KBUILD_OUTPUT"