d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix INSTALL_AS_USER

Browse Source 
Move INSTALL_AS_USER into bsd.init.mk to maximize the chance that
it has final authority over fooOWN and fooGRP.

Reviewed by:	sjg
MFC after:	3 days
Sponsored by:	Dell EMC
Differential Revision:	https://reviews.freebsd.org/D10810
This commit is contained in:
Eric van Gyzen 2017-05-28 00:43:12 +00:00
parent 3d98877013
commit 4f2bab59e7
2 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
share/mk/bsd.init.mk
View File

@ -16,6 +16,33 @@ __<bsd.init.mk>__:
.include <bsd.own.mk>
.MAIN: all
# Handle INSTALL_AS_USER here to maximize the chance that
# it has final authority over fooOWN and fooGRP.
.if ${MK_INSTALL_AS_USER} != "no"
.if !defined(_uid)
_uid!= id -u
.export _uid
.endif
.if ${_uid} != 0
.if !defined(USER)
# Avoid exporting USER
.if !defined(_USER)
_USER!= id -un
.export _USER
.endif
USER= ${_USER}
.endif
.if !defined(_gid)
_gid!= id -g
.export _gid
.endif
.for x in BIN CONF DOC DTB INFO KMOD LIB MAN NLS SHARE
$xOWN= ${USER}
$xGRP= ${_gid}
.endfor
.endif
.endif
# Some targets need to know when something may build. This is used to
# optimize targets that are only needed when building something, such as
# (not) reading in depend files. For DIRDEPS_BUILD, it will only calculate

25
share/mk/bsd.own.mk
View File

@ -135,31 +135,6 @@ CTFCONVERT_CMD=
CTFCONVERT_CMD= @:
.endif
.if ${MK_INSTALL_AS_USER} != "no"
.if !defined(_uid)
_uid!= id -u
.export _uid
.endif
.if ${_uid} != 0
.if !defined(USER)
# Avoid exporting USER
.if !defined(_USER)
_USER!= id -un
.export _USER
.endif
USER= ${_USER}
.endif
.if !defined(_gid)
_gid!= id -g
.export _gid
.endif
.for x in BIN CONF DOC DTB INFO KMOD LIB MAN NLS SHARE
$xOWN= ${USER}
$xGRP= ${_gid}
.endfor
.endif
.endif
.endif # !_WITHOUT_SRCCONF
# Binaries