From owner-svn-src-head@FreeBSD.ORG Tue Jun 17 22:23:37 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 14E076C5; Tue, 17 Jun 2014 22:23:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 DD54B2547; Tue, 17 Jun 2014 22:23:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5HMNarb039096; Tue, 17 Jun 2014 22:23:36 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5HMNao4039094; Tue, 17 Jun 2014 22:23:36 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201406172223.s5HMNao4039094@svn.freebsd.org> From: Bryan Drewery Date: Tue, 17 Jun 2014 22:23:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r267599 - in head: . share/man/man7 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.18 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: Tue, 17 Jun 2014 22:23:37 -0000 Author: bdrewery Date: Tue Jun 17 22:23:36 2014 New Revision: 267599 URL: http://svnweb.freebsd.org/changeset/base/267599 Log: - Add a LOCAL_ITOOLS to allow adding additional tools required for the installworld and distributeworld targets PR: 179562 Submitted by: Garrett Cooper MFC after: 1 week Modified: head/Makefile.inc1 head/share/man/man7/build.7 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Tue Jun 17 21:49:03 2014 (r267598) +++ head/Makefile.inc1 Tue Jun 17 22:23:36 2014 (r267599) @@ -17,6 +17,7 @@ # -DNO_DOCUPDATE do not update doc in ${MAKE} update # -DWITHOUT_CTF do not run the DTrace CTF conversion tools on built objects # LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list +# LOCAL_ITOOLS="list of tools" to add additional tools to the ITOOLS list # LOCAL_LIB_DIRS="list of dirs" to add additional dirs to libraries target # LOCAL_MTREE="list of mtree files" to process to allow local directories # to be created before files are installed @@ -756,7 +757,8 @@ _zoneinfo= zic tzsetup ITOOLS= [ awk cap_mkdb cat chflags chmod chown \ date echo egrep find grep id install ${_install-info} \ ln lockf make mkdir mtree mv pwd_mkdb \ - rm sed services_mkdb sh sysctl test true uname wc ${_zoneinfo} + rm sed services_mkdb sh sysctl test true uname wc ${_zoneinfo} \ + ${LOCAL_ITOOLS} # # distributeworld Modified: head/share/man/man7/build.7 ============================================================================== --- head/share/man/man7/build.7 Tue Jun 17 21:49:03 2014 (r267598) +++ head/share/man/man7/build.7 Tue Jun 17 22:23:36 2014 (r267599) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 27, 2014 +.Dd June 17, 2014 .Dt BUILD 7 .Os .Sh NAME @@ -415,6 +415,12 @@ If set, this variable supplies a list of the root of the source tree to build as part of the .Cm everything target. +.It Va LOCAL_ITOOLS +If set, this variable supplies a list of additional tools that are used by the +.Cm installworld +and +.Cm distributeworld +targets. .It Va LOCAL_LIB_DIRS If set, this variable supplies a list of additional directories relative to the root of the source tree to build as part of the