From: Francis Deslauriers <francis.deslauriers@efficios.com>
Date: Thu, 6 May 2021 21:50:03 +0000 (-0400)
Subject: Fix: builtin script referring to old directories
X-Git-Tag: v2.13.0-rc2~23
X-Git-Url: https://git.lttng.org/?p=lttng-modules.git;a=commitdiff_plain;h=ea9873c80b598b564819d0e94ef3dbec4eac0d0e

Fix: builtin script referring to old directories

Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I30fb8abb1a69d6695552947e30cf2b43d3db36b3
---

diff --git a/scripts/built-in.sh b/scripts/built-in.sh
index d9720230..f0594ecc 100755
--- a/scripts/built-in.sh
+++ b/scripts/built-in.sh
@@ -15,7 +15,7 @@ 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"
+echo 'source "lttng/src/Kconfig"' >> "${KERNEL_DIR}/Kconfig"
 sed -i 's#+= kernel/#+= kernel/ lttng/#' "${KERNEL_DIR}/Makefile"
 
 echo >&2
diff --git a/src/Kconfig b/src/Kconfig
index 85946faf..b7f670e6 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -13,4 +13,4 @@ config LTTNG
 
 	  If unsure, say N.
 
-source "lttng/tests/Kconfig"
+source "lttng/src/tests/Kconfig"