From: Michael Jeanson <mjeanson@efficios.com>
Date: Mon, 4 Mar 2019 16:14:56 +0000 (-0500)
Subject: jjb: fix modules build for broken v3.10 kernels
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=0f71a764e2e0eb8d3916f8ea711ef552dcf557bb;p=lttng-ci.git

jjb: fix modules build for broken v3.10 kernels

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---

diff --git a/scripts/lttng-modules/param-build.sh b/scripts/lttng-modules/param-build.sh
index 18c165f..00debb7 100644
--- a/scripts/lttng-modules/param-build.sh
+++ b/scripts/lttng-modules/param-build.sh
@@ -384,11 +384,12 @@ build_modules() {
 
         # Build modules
         KERNELDIR="${kdir}" make -j"${NPROC}" V=1 CC="$CC"
+	ret=$?
 
         set -e
 
         # We expect this build to fail, if it doesn't, fail the job.
-        if [ "$?" -eq 0 ]; then
+        if [ "$ret" -eq 0 ]; then
             echo "This build should have failed."
             exit 1
         fi
@@ -396,8 +397,6 @@ build_modules() {
         # We have to publish at least one file or the build will fail
         echo "This kernel is broken, there is a deadlock in the timekeeping subsystem." > "${outdir}/BROKEN.txt.ko"
 
-        set -e
-
         KERNELDIR="${kdir}" make clean
 
     else # Regular build