X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=scripts%2Fbuilt-in.sh;h=f0594eccdba217157bd016a2e75ad84805243333;hb=HEAD;hp=5e57e9341c03f6c0ab4e05a6cfcb68197d2e6d42;hpb=6c27a5ccba05b088fbfcf8cd982c25649838298d;p=lttng-modules.git

diff --git a/scripts/built-in.sh b/scripts/built-in.sh
index 5e57e934..5c580422 100755
--- a/scripts/built-in.sh
+++ b/scripts/built-in.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# SPDX-License-Identifier: (GPL-2.0 OR LGPL-2.1)
+# SPDX-License-Identifier: (GPL-2.0-only OR LGPL-2.1-only)
 
 set -e
 
@@ -15,8 +15,14 @@ KERNEL_DIR="$(readlink --canonicalize-existing "$1")"
 ln -sf "$(pwd)" "${KERNEL_DIR}/lttng"
 
 # Graft ourself to the kernel build system
-echo 'source "lttng/Kconfig"' >> "${KERNEL_DIR}/Kconfig"
-sed -i 's#+= kernel/#+= kernel/ lttng/#' "${KERNEL_DIR}/Makefile"
+echo 'source "lttng/src/Kconfig"' >> "${KERNEL_DIR}/Kconfig"
+
+# In kernel v6.1, subdirectories were moved to Kbuild
+if grep -qE '^obj-y[[:space:]]+\+= kernel/' "${KERNEL_DIR}/Kbuild"; then
+	echo 'obj-y += lttng/' >> "${KERNEL_DIR}/Kbuild"
+else
+	sed -i 's#+= kernel/#+= kernel/ lttng/#' "${KERNEL_DIR}/Makefile"
+fi
 
 echo >&2
 echo "    $0: done." >&2