summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2013-02-22 13:39:31 +0000
committerobache <obache@pkgsrc.org>2013-02-22 13:39:31 +0000
commit31200aadacf92abd544fc4b01cf4be5064302efd (patch)
tree109eb1f379cf9b6d5b9125e372b2f2b3a7a639a6 /mk
parentfc8ec3bd06c6c0073d1a855c35ed8bec234555d6 (diff)
downloadpkgsrc-31200aadacf92abd544fc4b01cf4be5064302efd.tar.gz
Fix ROOT_USER/ROOT_GROUP for Cygwin to Administrators/Administrators (not using
its UID/GID), and sync platform privilege check with bootstrap script.
Diffstat (limited to 'mk')
-rw-r--r--mk/platform/Cygwin.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/mk/platform/Cygwin.mk b/mk/platform/Cygwin.mk
index ae24bfc7e54..1836b8158c5 100644
--- a/mk/platform/Cygwin.mk
+++ b/mk/platform/Cygwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Cygwin.mk,v 1.5 2013/02/21 11:19:27 obache Exp $
+# $NetBSD: Cygwin.mk,v 1.6 2013/02/22 13:39:31 obache Exp $
#
# Variable definitions for the Windows with Cygwin.
@@ -54,7 +54,8 @@ PKGDIRMODE?= 775
# ROOT_USER might be numeric in the special case of Administrator; canonify it:
ROOT_CMD?= ${SU} - "$$(${ID} -un ${ROOT_USER})" -c
ROOT_USER?= ${BINOWN}
-ROOT_GROUP?= ${:!${ID} -g Administrators!}
+ROOT_GROUP?= Administrators
+_IS_ROOT_CMD?= ( ${ID} -nG | ${GREP} -q 'Administrators' )
TOUCH_FLAGS?=
ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d`
ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s`