From: Michael Jeanson <mjeanson@efficios.com>
Date: Tue, 22 Nov 2022 15:49:33 +0000 (-0500)
Subject: jjb: lttng-modules: fix build of v6.1-rc6
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=81e61c582089207454ff5b5b1de3f4c90479837d;p=lttng-ci.git

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

Change-Id: I00dba93b6af9a41fc99116fd8bf247efd706150d
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 ef7a3d0..178c434 100644
--- a/scripts/lttng-modules/param-build.sh
+++ b/scripts/lttng-modules/param-build.sh
@@ -285,6 +285,8 @@ 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
 
     # Debug
     #cat .config