jjb: lava: keep track of job exit status and configuration

[lttng-ci.git] / scripts / lttng-modules / param-build.sh

diff --git a/scripts/lttng-modules/param-build.sh b/scripts/lttng-modules/param-build.sh
index b34200187e607bddd319a989b64a4d5bc7fda421..814489c203d35758f47cc782dff3fd642966340c 100644 (file)
--- a/scripts/lttng-modules/param-build.sh
+++ b/scripts/lttng-modules/param-build.sh
@@ -48,7 +48,7 @@ prepare_lnx_sources() {
     if [ "$outdir" = "." ]; then
       koutput=""
     else
-      koutput="O=\"${outdir}\""
+      koutput="O=${outdir}"
     fi
 
     # Generate kernel configuration
@@ -100,9 +100,9 @@ prepare_lnx_sources() {
         make arch/powerpc/lib/crtsavres.o CC="$CC" ${koutput}
     fi
 
-    # On arm64 this object is required to build with ftrace support
+    # On arm64 between 4.13 and 1.15 this object is required to build with ftrace support
     if [ "${karch}" = "arm64" ]; then
-        if vergte "$KVERSION" "4.13-rc1"; then
+        if [ -f "arch/arm64/kernel/ftrace-mod.S" ]; then
             make arch/arm64/kernel/ftrace-mod.o CC="$CC" ${koutput}
         fi
     fi
@@ -334,13 +334,18 @@ if [ "${karch}" = "powerpc" ]; then
     cp -a --parents arch/powerpc/lib/crtsavres.[So] "${LNXHDRDIR}/"
 fi
 
-# On arm64 this object is required to build with ftrace support
+# On arm64 between 4.13 and 1.15 this object is required to build with ftrace support
 if [ "${karch}" = "arm64" ]; then
-    if vergte "$KVERSION" "4.13-rc1"; then
+    if [ -f "arch/arm64/kernel/ftrace-mod.S" ]; then
         cp -a --parents arch/arm64/kernel/ftrace-mod.[So] "${LNXHDRDIR}/"
     fi
 fi
 
+# Newer kernels need objtool to build modules when CONFIG_STACK_VALIDATION=y
+if [ -f tools/objtool/objtool ]; then
+  cp -a --parents tools/objtool/objtool "${LNXHDRDIR}/"
+fi
+
 # Copy modules related stuff, if available
 if [ -s Module.symvers ]; then
     cp Module.symvers "${LNXHDRDIR}"