diff options
| author | joerg <joerg@pkgsrc.org> | 2006-10-09 10:30:27 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-10-09 10:30:27 +0000 |
| commit | bc2ee3463ca7574bae408d46ffb7168ed984aff9 (patch) | |
| tree | ff1f27536bbc294097fddba5a1b4dc5d14247a9d /mk/bsd.pkg.mk | |
| parent | bafcfef842c0df14b8fcceaa85a3e2af04d6c346 (diff) | |
| download | pkgsrc-bc2ee3463ca7574bae408d46ffb7168ed984aff9.tar.gz | |
Introduce _SU_ROOT_USER, which can be used for partially unprivileged
builds, when the normal ROOT_USER overrides should happen, but
su-target is still desired to work.
Diffstat (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index b3aa3da3bac..c260127bb72 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1885 2006/10/03 14:22:16 gdt Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1886 2006/10/09 10:30:27 joerg Exp $ # # This file is in the public domain. # @@ -86,6 +86,9 @@ PKGWILDCARD?= ${PKGBASE}-[0-9]* SVR4_PKGNAME?= ${PKGNAME} WRKSRC?= ${WRKDIR}/${DISTNAME} +# Override for SU_CMD user check +_SU_ROOT_USER?= ${ROOT_USER} + .if (defined(INSTALL_UNSTRIPPED) && !empty(INSTALL_UNSTRIPPED:M[yY][eE][sS])) || defined(DEBUG_FLAGS) _INSTALL_UNSTRIPPED= # set (flag used by platform/*.mk) .endif @@ -695,7 +698,7 @@ su-target: .USE "") ;; \ *) ${PRE_CMD.su-${.TARGET}} ;; \ esac; \ - if ${TEST} `${ID} -u` = `${ID} -u ${ROOT_USER}`; then \ + if ${TEST} `${ID} -u` = `${ID} -u ${_SU_ROOT_USER}`; then \ ${_ROOT_CMD}; \ else \ case ${PRE_ROOT_CMD:Q}"" in \ @@ -703,9 +706,9 @@ su-target: .USE *) ${WARNING_MSG} "Running: "${PRE_ROOT_CMD:Q} ;; \ esac; \ ${PRE_ROOT_CMD}; \ - ${STEP_MSG} "Becoming \`\`${ROOT_USER}'' to make su-${.TARGET} (`${ECHO} ${SU_CMD} | ${AWK} '{ print $$1 }'`)"; \ + ${STEP_MSG} "Becoming \`\`${_SU_ROOT_USER}'' to make su-${.TARGET} (`${ECHO} ${SU_CMD} | ${AWK} '{ print $$1 }'`)"; \ ${SU_CMD} ${_ROOT_CMD:Q}; \ - ${STEP_MSG} "Dropping \`\`${ROOT_USER}'' privileges."; \ + ${STEP_MSG} "Dropping \`\`${_SU_ROOT_USER}'' privileges."; \ fi ################################################################ |