From owner-svn-src-head@freebsd.org Wed Dec 2 00:49:47 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B8CEFA3E131; Wed, 2 Dec 2015 00:49:47 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7B9751ACC; Wed, 2 Dec 2015 00:49:47 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB20nkNb058709; Wed, 2 Dec 2015 00:49:46 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB20nkbR058704; Wed, 2 Dec 2015 00:49:46 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201512020049.tB20nkbR058704@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Wed, 2 Dec 2015 00:49:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r291627 - in head: cddl/usr.sbin cddl/usr.sbin/plockstat targets/pseudo/userland/cddl tools/build/mk X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Dec 2015 00:49:47 -0000 Author: bdrewery Date: Wed Dec 2 00:49:45 2015 New Revision: 291627 URL: https://svnweb.freebsd.org/changeset/base/291627 Log: Fully connect cddl/usr.sbin/plockstat. There seems to be no reason to keep this so private. Also add missing optional MK_CDDL files. Sponsored by: EMC / Isilon Storage Division Added: head/cddl/usr.sbin/plockstat/Makefile.depend (contents, props changed) Modified: head/cddl/usr.sbin/Makefile head/targets/pseudo/userland/cddl/Makefile.depend head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/cddl/usr.sbin/Makefile ============================================================================== --- head/cddl/usr.sbin/Makefile Wed Dec 2 00:49:42 2015 (r291626) +++ head/cddl/usr.sbin/Makefile Wed Dec 2 00:49:45 2015 (r291627) @@ -25,10 +25,8 @@ _zhack= zhack _dtrace= dtrace _dtruss= dtruss _lockstat= lockstat -.if defined(WITH_PLOCKSTAT) _plockstat= plockstat .endif -.endif .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" _dtrace= dtrace Added: head/cddl/usr.sbin/plockstat/Makefile.depend ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cddl/usr.sbin/plockstat/Makefile.depend Wed Dec 2 00:49:45 2015 (r291627) @@ -0,0 +1,27 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + cddl/lib/libctf \ + cddl/lib/libdtrace \ + gnu/lib/csu \ + gnu/lib/libgcc \ + include \ + include/xlocale \ + lib/${CSU_DIR} \ + lib/libc \ + lib/libcompiler_rt \ + lib/libcxxrt \ + lib/libelf \ + lib/libproc \ + lib/librtld_db \ + lib/libthr \ + lib/libutil \ + lib/libz \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif Modified: head/targets/pseudo/userland/cddl/Makefile.depend ============================================================================== --- head/targets/pseudo/userland/cddl/Makefile.depend Wed Dec 2 00:49:42 2015 (r291626) +++ head/targets/pseudo/userland/cddl/Makefile.depend Wed Dec 2 00:49:45 2015 (r291627) @@ -20,6 +20,7 @@ DIRDEPS = \ cddl/usr.sbin/dtrace \ cddl/usr.sbin/dtruss \ cddl/usr.sbin/lockstat \ + cddl/usr.sbin/plockstat \ DIRDEPS.ZFS = \ Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Wed Dec 2 00:49:42 2015 (r291626) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Wed Dec 2 00:49:45 2015 (r291627) @@ -978,7 +978,11 @@ OLD_FILES+=usr/lib32/libuutil_p.a OLD_LIBS+=lib/libdtrace.so.2 OLD_FILES+=usr/sbin/dtrace OLD_FILES+=usr/sbin/lockstat +OLD_FILES+=usr/sbin/plockstat OLD_FILES+=usr/share/man/man1/dtrace.1.gz +OLD_FILES+=usr/share/man/man1/dtruss.1.gz +OLD_FILES+=usr/share/man/man1/lockstat.1.gz +OLD_FILES+=usr/share/man/man1/plockstat.1.gz OLD_FILES+=usr/share/dtrace/disklatency OLD_FILES+=usr/share/dtrace/disklatencycmd OLD_FILES+=usr/share/dtrace/hotopen