From owner-svn-src-head@freebsd.org Wed May 9 13:44:55 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BAD3DFB93C2; Wed, 9 May 2018 13:44:55 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5B7D668348; Wed, 9 May 2018 13:44:55 +0000 (UTC) (envelope-from brd@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3CFDF12405; Wed, 9 May 2018 13:44:55 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w49DitTk061910; Wed, 9 May 2018 13:44:55 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w49Dist5061908; Wed, 9 May 2018 13:44:54 GMT (envelope-from brd@FreeBSD.org) Message-Id: <201805091344.w49Dist5061908@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Wed, 9 May 2018 13:44:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r333407 - head/share/mk X-SVN-Group: head X-SVN-Commit-Author: brd X-SVN-Commit-Paths: head/share/mk X-SVN-Commit-Revision: 333407 X-SVN-Commit-Repository: base 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.25 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, 09 May 2018 13:44:56 -0000 Author: brd Date: Wed May 9 13:44:54 2018 New Revision: 333407 URL: https://svnweb.freebsd.org/changeset/base/333407 Log: Enable directory creation with FILESDIR. This is part of packaging base work. Reviewed by: will Approved by: bapt (mentor), allanjude (mentor) Differential Revision: https://reviews.freebsd.org/D15130 Modified: head/share/mk/bsd.files.mk head/share/mk/bsd.own.mk Modified: head/share/mk/bsd.files.mk ============================================================================== --- head/share/mk/bsd.files.mk Wed May 9 12:25:23 2018 (r333406) +++ head/share/mk/bsd.files.mk Wed May 9 13:44:54 2018 (r333407) @@ -67,7 +67,7 @@ STAGE_AS_${file:T}= ${${group}NAME_${file:T}} STAGE_DIR.${file:T}= ${STAGE_OBJTOP}${${group}DIR_${file:T}} stage_as.${file:T}: ${file} -installfiles-${group}: _${group}INS_${file:T} +installfiles-${group}: installdirs-${group} _${group}INS_${file:T} _${group}INS_${file:T}: ${file} ${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN_${.ALLSRC:T}} \ -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ @@ -77,10 +77,24 @@ _${group}INS_${file:T}: ${file} _${group}FILES+= ${file} .endif .endfor + + +installdirs-${group}: + @echo installing dirs ${group}DIR ${${group}DIR} +.for dir in ${${group}DIR} +.if defined(NO_ROOT) + ${INSTALL} ${${group}TAG_ARGS} -d ${DESTDIR}${dir} +.else + ${INSTALL} ${${group}TAG_ARGS} -d -o ${DIROWN} -g ${DIRGRP} \ + -m ${DIRMODE} ${DESTDIR}${dir} +.endif +.endfor + + .if !empty(_${group}FILES) stage_files.${group}: ${_${group}FILES} -installfiles-${group}: _${group}INS +installfiles-${group}: installdirs-${group} _${group}INS _${group}INS: ${_${group}FILES} .if defined(${group}NAME) ${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN} -g ${${group}GRP} \ Modified: head/share/mk/bsd.own.mk ============================================================================== --- head/share/mk/bsd.own.mk Wed May 9 12:25:23 2018 (r333406) +++ head/share/mk/bsd.own.mk Wed May 9 13:44:54 2018 (r333407) @@ -75,6 +75,13 @@ # CONFMODE Configuration file mode. [644] # # +# DIROWN Directory owner. [root] +# +# DIRGRP Directory group. [wheel] +# +# DIRMODE Directory mode. [755] +# +# # DOCDIR Base path for system documentation (e.g. PSD, USD, # handbook, FAQ etc.). [${SHAREDIR}/doc] # @@ -185,6 +192,10 @@ MANDIR?= ${SHAREDIR}/man/man MANOWN?= ${SHAREOWN} MANGRP?= ${SHAREGRP} MANMODE?= ${NOBINMODE} + +DIROWN?= root +DIRGRP?= wheel +DIRMODE?= 755 DOCDIR?= ${SHAREDIR}/doc DOCOWN?= ${SHAREOWN}