X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-modules%2Fparam-build.sh;h=4147c44a64a95688a6123680ccf5e50b7671ad0a;hb=d6237b1bb90d2e5afedc55b77b1fa52f5506f260;hp=ef7a3d0d8fa021b8b8ed194f1dfa9bd6e87366d5;hpb=c72041ebe744c7c3fd8411fafd93abe46292bff4;p=lttng-ci.git

diff --git a/scripts/lttng-modules/param-build.sh b/scripts/lttng-modules/param-build.sh
index ef7a3d0..4147c44 100644
--- a/scripts/lttng-modules/param-build.sh
+++ b/scripts/lttng-modules/param-build.sh
@@ -285,6 +285,11 @@ build_linux_kernel() {
 
     # 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
+
+    # Disable SORTTAB
+    sed -i 's/is_enabled CONFIG_BUILDTIME_TABLE_SORT/is_enabled CONFIG_NONEXISTANT/' scripts/link-vmlinux.sh || true
 
     # Debug
     #cat .config