From cd8f5ebb0e2c7ad99508dbc81eb444bfe7e1b983 Mon Sep 17 00:00:00 2001 From: snj Date: Sat, 23 Sep 2017 17:50:43 +0000 Subject: [PATCH] Pull up following revision(s) (requested by sevan in ticket #289): distrib/sets/lists/base/mi: revision 1.1161 external/cddl/Makefile: revision 1.4 external/cddl/dtracetoolkit/Makefile: revision 1.1 external/cddl/dtracetoolkit/dist/Makefile: revision 1.1 Include scripts from the DTrace Toolkit if DTrace support is enabled. The following scripts are installed: dtruss - a DTrace version of truss. execsnoop - snoop process execution as it occurs. opensnoop - snoop file opens as they occur. procsystime - print process system call time details. ok riastradh --- distrib/sets/lists/base/mi | 6 +++++- external/cddl/Makefile | 6 +++++- external/cddl/dtracetoolkit/Makefile | 5 +++++ external/cddl/dtracetoolkit/dist/Makefile | 16 ++++++++++++++++ 4 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 external/cddl/dtracetoolkit/Makefile create mode 100644 external/cddl/dtracetoolkit/dist/Makefile diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi index 3d531c5430d4..ff462b9498c6 100644 --- a/distrib/sets/lists/base/mi +++ b/distrib/sets/lists/base/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1158 2017/05/27 21:02:54 bouyer Exp $ +# $NetBSD: mi,v 1.1158.2.1 2017/09/23 17:50:43 snj Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -1645,6 +1645,7 @@ ./usr/sbin/download-vulnerability-list base-pkgutil-bin ./usr/sbin/dtmfdecode base-isdn-bin ./usr/sbin/dtrace base-debug-bin dtrace +./usr/sbin/dtruss base-debug-bin dtrace ./usr/sbin/dumpfs base-sysutil-bin ./usr/sbin/dumplfs base-sysutil-bin ./usr/sbin/eaytest base-obsolete obsolete @@ -1654,6 +1655,7 @@ ./usr/sbin/eshconfig base-sysutil-bin ./usr/sbin/etcupdate base-sysutil-bin ./usr/sbin/extattrctl base-sysutil-bin +./usr/sbin/execsnoop base-debug-bin dtrace ./usr/sbin/faithd base-router-bin inet6 ./usr/sbin/fixmount base-nfsclient-bin ./usr/sbin/flashctl base-sysutil-bin @@ -1802,6 +1804,7 @@ ./usr/sbin/ntptimeset base-obsolete obsolete ./usr/sbin/ntptrace base-ntp-bin ./usr/sbin/omshell base-dhcpd-bin +./usr/sbin/opensnoop base-debug-bin dtrace ./usr/sbin/pac base-sysutil-bin ./usr/sbin/paxctl base-sysutil-bin ./usr/sbin/pcictl base-sysutil-bin @@ -1837,6 +1840,7 @@ ./usr/sbin/pppoectl base-obsolete obsolete ./usr/sbin/pppstats base-ppp-bin ./usr/sbin/praliases base-obsolete obsolete +./usr/sbin/procsystime base-debug-bin dtrace ./usr/sbin/psrset base-sysutil-bin ./usr/sbin/pstat base-sysutil-bin ./usr/sbin/pvcsif base-netutil-bin diff --git a/external/cddl/Makefile b/external/cddl/Makefile index adcfc84ec937..baaaa3e7246d 100644 --- a/external/cddl/Makefile +++ b/external/cddl/Makefile @@ -1,8 +1,12 @@ -# $NetBSD: Makefile,v 1.3 2014/03/25 09:52:55 ozaki-r Exp $ +# $NetBSD: Makefile,v 1.3.18.1 2017/09/23 17:50:43 snj Exp $ .include # We need more modular flag e.g. we can add dtrace to osnet later +.if (${MKDTRACE} != "no") +SUBDIR+= dtracetoolkit +.endif + .if ( ${MKZFS} != "no" || ${MKDTRACE} != "no" || ${MKCTF} != "no") SUBDIR+= osnet .endif diff --git a/external/cddl/dtracetoolkit/Makefile b/external/cddl/dtracetoolkit/Makefile new file mode 100644 index 000000000000..f718750d9187 --- /dev/null +++ b/external/cddl/dtracetoolkit/Makefile @@ -0,0 +1,5 @@ +# $NetBSD: Makefile,v 1.1.2.2 2017/09/23 17:50:43 snj Exp $ + +SUBDIR= dist + +.include diff --git a/external/cddl/dtracetoolkit/dist/Makefile b/external/cddl/dtracetoolkit/dist/Makefile new file mode 100644 index 000000000000..9150487d533b --- /dev/null +++ b/external/cddl/dtracetoolkit/dist/Makefile @@ -0,0 +1,16 @@ +# $NetBSD: Makefile,v 1.1.2.2 2017/09/23 17:50:43 snj Exp $ + +.include + +.if (${MKDTRACE} != "no") +FILES= dtruss +FILES+= execsnoop +FILES+= opensnoop +FILES+= procsystime + +FILESDIR= /usr/sbin +FILESMODE= 555 +.endif + +.include +.include