svn commit: r300226 - in head: cddl/contrib/dtracetoolkit cddl/usr.sbin cddl/usr.sbin/dtruss share/dtrace share/dtrace/toolkit

[George V. Neville-Neil]

Author: gnn
Date: Thu May 19 19:51:39 2016
New Revision: 300226
URL: https://svnweb.freebsd.org/changeset/base/300226

Log:
  Remove the old version of the DTraceToolkit from the source tree.
  The DTraceToolkit is part of the Open DTrace effort and is supported
  on FreeBSD as a port (sysutils/DTraceToolkit) which has been updated
  to properly track toolkit development upstream.
  
  Sponsored by:	DARPA, AFRL

Deleted:
  head/cddl/contrib/dtracetoolkit/
  head/cddl/usr.sbin/dtruss/
  head/share/dtrace/toolkit/
Modified:
  head/cddl/usr.sbin/Makefile
  head/share/dtrace/Makefile
  head/share/dtrace/README

Modified: head/cddl/usr.sbin/Makefile
==============================================================================
--- head/cddl/usr.sbin/Makefile	Thu May 19 19:27:33 2016	(r300225)
+++ head/cddl/usr.sbin/Makefile	Thu May 19 19:51:39 2016	(r300226)
@@ -3,7 +3,6 @@
 .include <src.opts.mk>
 
 SUBDIR=	${_dtrace} \
-	${_dtruss} \
 	${_lockstat} \
 	${_plockstat} \
 	${_tests} \
@@ -23,14 +22,12 @@ _zhack=	zhack
 
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
 _dtrace=	dtrace
-_dtruss=	dtruss
 _lockstat=	lockstat
 _plockstat=	plockstat
 .endif
 
 .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm"
 _dtrace=	dtrace
-_dtruss=	dtruss
 _lockstat=	lockstat
 .endif
 
@@ -40,7 +37,6 @@ _dtrace=	dtrace
 
 .if ${MACHINE_CPUARCH} == "powerpc"
 _dtrace=	dtrace
-_dtruss=	dtruss
 _lockstat=	lockstat
 .endif
 

Modified: head/share/dtrace/Makefile
==============================================================================
--- head/share/dtrace/Makefile	Thu May 19 19:27:33 2016	(r300225)
+++ head/share/dtrace/Makefile	Thu May 19 19:51:39 2016	(r300226)
@@ -6,12 +6,6 @@
 
 .include <src.opts.mk>
 
-SUBDIR= ${_toolkit}
-
-.if ${MK_CDDL} != "no"
-_toolkit=	toolkit
-.endif
-
 SCRIPTS=	blocking \
 		disklatency \
 		disklatencycmd \

Modified: head/share/dtrace/README
==============================================================================
--- head/share/dtrace/README	Thu May 19 19:27:33 2016	(r300225)
+++ head/share/dtrace/README	Thu May 19 19:51:39 2016	(r300226)
@@ -1,11 +1,5 @@
 $FreeBSD$
 
-This directory contains scripts for use with the DTrace system.  The
-toolkit/ directory installs the latest vendor import of Brendan
-Gregg's DTraceToolkit while the other files and directories
-contain code generated by the FreeBSD Project for use with DTrace on
-FreeBSD.
-
-NOTE: Do not add new scripts to the toolkit directory. New DTraceToolkit
-scripts should be send to the maintainer of the toolkit and then brought
-back into FreeBSD via future vendor imports.
+This directory contains scripts for use with the DTrace system.
+These files and directories contain code generated by the FreeBSD
+Project for use with DTrace on FreeBSD.