dtrace: ensure that building outside src tree works

The Makefile.build and Makefile.modpost uses of dtrace_sdt.sh were
not safe for out-of-srctree building because they expected to be
able to call the scripts with a relative path.  This has been
corrected.  The problem was introduced with the SDT-in-modules
support.

Orabug: 18691341

Signed-off-by: Kris Van Hees <kris.van.hees@oracle.com>
Acked-by: Chuck Anderson <chuck.anderson@oracle.com>
Acked-by: Jerry Snitselaar <jerry.snitselaar@oracle.com>

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 81ec4f729d5c284ffa355b875b91ab1a4332e375..97a8006357638a8408bbb6e0feb2f1a50bc11b5a 100644 (file)
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -385,7 +385,7 @@ ifdef CONFIG_DTRACE
 # We need secondary expansion for the %.sdtstub.S creation rule
 .SECONDEXPANSION:
 
-sdtgen = scripts/dtrace_sdt.sh
+sdtgen = $(srctree)/scripts/dtrace_sdt.sh
 
 quiet_cmd_sdtstub = SDTSTB  $@
       cmd_sdtstub = $(sdtgen) sdtstub $@ \

diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index 4cf971c3cc701660cc64c97e79056dba611da105..cec7ba293f2aa32dd643ccfe5d517a85b6f9d9dc 100644 (file)
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -116,7 +116,7 @@ quiet_cmd_cc_o_c = CC      $@
 
 ifdef CONFIG_DTRACE
 
-sdtgen = scripts/dtrace_sdt.sh
+sdtgen = $(srctree)/scripts/dtrace_sdt.sh
 
 quiet_cmd_sdtinfo = SDTINF  $@
       cmd_sdtinfo = $(sdtgen) sdtinfo $@ $< kmod