stap-report script packaging & tweaks

5 files changed, 13 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 05834b96..de4e934b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-17  Frank Ch. Eigler  <fche@elastic.org>
+
+	* stap-report: Add kernel config extracts.  Generate to stdout.
+	* Makefile.am (bin_SCRIPTS): Install it.
+	* systemtap.spec: Package it.
+	* Makefile.in: Regenerated.
+
 2008-10-17  Jim Keniston  <jkenisto@us.ibm.com>
 
 	PR6923
diff --git a/Makefile.am b/Makefile.am
index 1e356a4f..b3a4801e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,7 @@ man_MANS =  stap.1 stapprobes.5 stapfuncs.5 stapvars.5 stapex.5 staprun.8 stap-s
 # see also configure.ac
 
 bin_PROGRAMS = stap staprun
-bin_SCRIPTS = stap-client stap-server stap-serverd stap-find-servers stap-start-server stap-find-or-start-server stap-stop-server
+bin_SCRIPTS = stap-client stap-server stap-serverd stap-find-servers stap-start-server stap-find-or-start-server stap-stop-server stap-report
 stap_SOURCES = main.cxx \
 	parse.cxx staptree.cxx elaborate.cxx translate.cxx \
 	tapsets.cxx buildrun.cxx loc2c.c hash.cxx mdfour.c \
diff --git a/Makefile.in b/Makefile.in
index 22336ec0..d43fde6f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -261,7 +261,7 @@ AM_CPPFLAGS = -DBINDIR='"$(bindir)"' -DPKGDATADIR='"${pkgdatadir}"' -DPKGLIBDIR=
 AM_CFLAGS = -D_GNU_SOURCE -fexceptions -Wall -Werror -Wunused -Wformat=2 -W
 AM_CXXFLAGS = -Wall -Werror
 man_MANS = stap.1 stapprobes.5 stapfuncs.5 stapvars.5 stapex.5 staprun.8 stap-server.8 man/stapprobes.iosched.5 man/stapprobes.netdev.5 man/stapprobes.nfs.5 man/stapprobes.nfsd.5 man/stapprobes.pagefault.5 man/stapprobes.process.5 man/stapprobes.rpc.5 man/stapprobes.scsi.5 man/stapprobes.signal.5 man/stapprobes.socket.5 man/stapprobes.tcp.5 man/stapprobes.udp.5
-bin_SCRIPTS = stap-client stap-server stap-serverd stap-find-servers stap-start-server stap-find-or-start-server stap-stop-server
+bin_SCRIPTS = stap-client stap-server stap-serverd stap-find-servers stap-start-server stap-find-or-start-server stap-stop-server stap-report
 stap_SOURCES = main.cxx \
 	parse.cxx staptree.cxx elaborate.cxx translate.cxx \
 	tapsets.cxx buildrun.cxx loc2c.c hash.cxx mdfour.c \
diff --git a/stap-report b/stap-report
index c2a5d070..e6503b31 100755
--- a/stap-report
+++ b/stap-report
@@ -4,8 +4,7 @@ import sys
 import time 
 import subprocess
 
-ofname = "/tmp/stapreport-" + time.strftime("%Y%m%d%H%M%S") + ".txt"
-ofile = open(ofname, "w")
+ofile = sys.stdout
 
 def run(command):
   ofile.write("== " + command + " ==\n")
@@ -13,20 +12,15 @@ def run(command):
   p = subprocess.Popen(command, shell=True, stdout=ofile, stderr=ofile)
   p.wait()
   ofile.write("\n") 
-  sys.stdout.write(".")
-  sys.stdout.flush()
 
 if __name__ == "__main__":
-  sys.stdout.write("Collecting data")
-  sys.stdout.flush()
   run("stap -V")
   run("which stap")
   run("ls -ald `locate -r '/stap$'` `locate -r '/staprun$'`")
   run("printenv | egrep '^PATH=|^LD_LIBRARY_PATH=|^SYSTEMTAP_.*='")
   run("gcc -v")
   run("uname -a")
-  run("dmesg | grep 'gcc'")
   run("dmesg | egrep 'stap|systemtap' | tail -n 10")
   run("cat /proc/cpuinfo | egrep 'processor|vendor_id|model name'")
   run(r"rpm -qa --qf %{name}-%{version}-%{release}.%{arch}\\n | egrep 'systemtap|elfutils|kernel|gcc' | sort")
-  print "\nPlease include the following file in your bug report:", ofname
+  run(r"egrep 'PROBE|TRACE|MARKER' /lib/modules/`uname -r`/build/.config | grep -v not.set | sort | fmt -w 80")
diff --git a/systemtap.spec b/systemtap.spec
index 1a967cf1..9327b4ad 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -169,9 +169,6 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/examples examples
 # Fix paths in the example & testsuite scripts
 find examples testsuite -type f -name '*.stp' -print0 | xargs -0 sed -i -r -e '1s@^#!.+stap@#!%{_bindir}/stap@'
 
-# To avoid perl dependency, make perl sample script non-executable
-#chmod -x examples/samples/kmalloc-top
-
 # Because "make install" may install staprun with mode 04111, the
 # post-processing programs rpmbuild runs won't be able to read it.
 # So, we change permissions so that they can read it.  We'll set the
@@ -207,6 +204,7 @@ exit 0
 %endif
 
 %{_bindir}/stap
+%{_bindir}/stap-report
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 
@@ -227,6 +225,7 @@ exit 0
 %files runtime
 %defattr(-,root,root)
 %attr(4111,root,root) %{_bindir}/staprun
+%{_bindir}/stap-report
 %{_libexecdir}/%{name}
 %{_mandir}/man8/staprun.8*