diff options
| author | cheusov <cheusov@pkgsrc.org> | 2014-08-14 00:21:24 +0000 |
|---|---|---|
| committer | cheusov <cheusov@pkgsrc.org> | 2014-08-14 00:21:24 +0000 |
| commit | e02f9607e3b75882a9e30127322f7492a3a4b4a6 (patch) | |
| tree | af99892ee8a56e3c0111905595d6375a55406bd6 | |
| parent | 0412a0c8c2534b3c629a3bb46c7926b5c3d8b741 (diff) | |
| download | pkgsrc-e02f9607e3b75882a9e30127322f7492a3a4b4a6.tar.gz | |
Fix packages creation on Interix.
User/group names are used instead of uid/gid.
Problem with spaces inside user/group name should be fixed by Cygwin
support added some time ago.
| -rwxr-xr-x | bootstrap/bootstrap | 6 | ||||
| -rw-r--r-- | mk/platform/Interix.mk | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index 9da88699a86..2d24923b173 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.211 2014/08/01 15:01:16 schmonz Exp $ +# $NetBSD: bootstrap,v 1.212 2014/08/14 00:21:24 cheusov Exp $ # # Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org> # All rights reserved. @@ -616,8 +616,8 @@ Interix) mkdir -p "$@" # allows umask to take effect } default_install_mode=0775 - root_user=`id -u` - root_group=131616 + root_user=`id -un` + root_group=+Administrators case `uname -r` in 3.* | 5.*) need_bsd_install=yes diff --git a/mk/platform/Interix.mk b/mk/platform/Interix.mk index 9ce6410833f..8b3ccd8691e 100644 --- a/mk/platform/Interix.mk +++ b/mk/platform/Interix.mk @@ -1,4 +1,4 @@ -# $NetBSD: Interix.mk,v 1.72 2014/08/13 18:48:09 cheusov Exp $ +# $NetBSD: Interix.mk,v 1.73 2014/08/14 00:21:24 cheusov Exp $ # # Variable definitions for the Interix operating system. @@ -98,7 +98,7 @@ 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?= 131616 # +Administrators or native language equivalent +ROOT_GROUP?= +Administrators # or native language equivalent TOUCH_FLAGS?= ULIMIT_CMD_datasize?= ulimit -d `ulimit -H -d` ULIMIT_CMD_stacksize?= ulimit -s `ulimit -H -s` |