2005-07-11 Martin Hunt <hunt@redhat.com>

	* build_probe: Set RELAYFS correctly.

	* Makefile.template: Fix for RELAYFS.

	* stp: Moved here.  All probes now use this copy.

	* ALL/stp: source the master copy of stp.

1 files changed, 10 insertions, 2 deletions

diff --git a/runtime/probes/build_probe b/runtime/probes/build_probe
index 9eadebd2..7e3207b1 100755
--- a/runtime/probes/build_probe
+++ b/runtime/probes/build_probe
@@ -7,7 +7,7 @@ proc usage {} {
 }
 
 # use Makefile.template to generate a Makefile
-proc create_makefile {target} {
+proc create_makefile {target relayfs} {
   if {[catch {open ../Makefile.template r} fd]} {
     puts "ERROR opening ../Makefile.template"
     exit -1
@@ -20,6 +20,9 @@ proc create_makefile {target} {
     if {[regsub XXX $line $target newline]} {
       set line $newline
     }
+    if {[regsub RELAYFS $line $relayfs newline]} {
+      set line $newline
+    }
     puts $mfd $line
   }
   close $fd
@@ -123,10 +126,15 @@ foreach arg $argv {
   }
 }
 
+set relayfs ""
+if {![file exists /lib/modules/[exec uname -r]/build/include/linux/relayfs_fs.h]} {
+  set relayfs {-I $(RT)/relayfs}
+}
+
 if {![catch {open targets r} tfd]} {
   while {[gets $tfd line] >= 0} {
     set target [lindex $line 0]
-    create_makefile $target
+    create_makefile $target $relayfs
     build $target
     catch {exec /bin/rm Makefile}
   }