jjb: lttng-modules: fix build of v6.1-rc6

[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 cb7d2f377e61f3b08fe90752154bf07617328818..178c434465d7b720efada4a57d878d97d8f0dce8 100644 (file)
--- a/scripts/lttng-modules/param-build.sh
+++ b/scripts/lttng-modules/param-build.sh
@@ -267,6 +267,9 @@ build_linux_kernel() {
       scripts/config --disable CONFIG_IGBVF
     fi
 
+    # Don't fail the build on warnings
+    scripts/config --disable CONFIG_WERROR
+
     # Set required options
     scripts/config --enable CONFIG_TRACEPOINTS
     scripts/config --enable CONFIG_KALLSYMS
@@ -280,6 +283,11 @@ build_linux_kernel() {
     scripts/config --enable CONFIG_EVENT_TRACING
     scripts/config --enable CONFIG_KRETPROBES
 
+    # FIXME: disable objtool on vmlinux, it OOMs on allyesconfig
+    sed -i 's/objtool_link vmlinux.o//' scripts/link-vmlinux.sh || true
+    # Starting with v6.1-rc6
+    sed -i 's/^objtool-enabled := .*/objtool-enabled := /' scripts/Makefile.vmlinux_o || true
+
     # Debug
     #cat .config
 
@@ -387,7 +395,9 @@ extract_distro_headers() {
     touch -r "${LINUX_HDROBJ_DIR}/.config" "${LINUX_HDROBJ_DIR}/include/generated/autoconf.h"
 
     # Copy .config to include/config/auto.conf so "make prepare" is unnecessary.
-    cp "${LINUX_HDROBJ_DIR}/.config" "${LINUX_HDROBJ_DIR}/include/config/auto.conf"
+    if [ ! -f "${LINUX_HDROBJ_DIR}/include/config/auto.conf" ]; then
+        cp "${LINUX_HDROBJ_DIR}/.config" "${LINUX_HDROBJ_DIR}/include/config/auto.conf"
+    fi
 
     # Finally clean the object files from the full source tree
     make clean
@@ -433,7 +443,7 @@ build_modules() {
 
     # Try to catch some compatibility problems by turning some
     # warnings into errors.
-    export KCFLAGS="$KCFLAGS -Wall -Werror"
+    #export KCFLAGS="$KCFLAGS -Wall -Werror"
 
     # Enter lttng-modules source dir
     cd "${MODULES_GIT_DIR}"