macports/macports-base
0
0
Fork 0
mirror of https://github.com/macports/macports-base.git synced 2026-07-12 18:18:43 -07:00
Code Issues Packages Projects Releases Wiki Activity

Work around mtree quirk

Browse Source 
Turns out mtree -U won't complain but also won't actually create any
directories if not all of uname, gname, and mode are specified, even
when it can't enforce the ownership. But it's happy if you give it any
gname.
This commit is contained in:
Joshua Root
2023-12-07 20:51:55 +11:00
parent 5fddde06d3
commit cd992816c8
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure
Vendored
+8 -3
View File
@@ -703,7 +703,7 @@ UNIVERSAL_ARCHS
startupitem_install
MPFRAMEWORKSDIR
MPAPPLICATIONSDIR
MTREE_UGNAME
MTREE_GNAME
DSTMODE
RUNUSR
DSTGRP
@@ -7014,10 +7014,15 @@ printf "%s\n" "$DSTMODE" >&6; }
fi
# Don't set uname or gname in .mtree files unless root
# Don't set real uname or gname in .mtree files unless root
# https://trac.macports.org/ticket/49501
if test "$DSTUSR" = "root" ; then
MTREE_UGNAME="uname=root gname=$DSTGRP"
MTREE_GNAME="$DSTGRP"
else
# This has to be set to something or mtree won't create any directories.
# It doesn't matter what it's set to for non-root though, as it can't
# change the ownership anyway.
MTREE_GNAME="admin"
fi
configure.ac
+8 -3
View File
@@ -227,12 +227,17 @@ MP_CHECK_RUNUSER
MP_DIRECTORY_MODE
MP_SHARED_DIRECTORY
# Don't set uname or gname in .mtree files unless root
# Don't set real uname or gname in .mtree files unless root
# https://trac.macports.org/ticket/49501
if test "$DSTUSR" = "root" ; then
MTREE_UGNAME="uname=root gname=$DSTGRP"
MTREE_GNAME="$DSTGRP"
else
# This has to be set to something or mtree won't create any directories.
# It doesn't matter what it's set to for non-root though, as it can't
# change the ownership anyway.
MTREE_GNAME="admin"
fi
AC_SUBST(MTREE_UGNAME)
AC_SUBST(MTREE_GNAME)
# Check for default directories
MP_PATH_APPLICATIONS
doc/base.mtree.in
+1 -1
View File
@@ -1,7 +1,7 @@
# MacPorts filesystem hierarchy, for internal use only. Changes to this file will not stick across installations.
#
/set type=dir @MTREE_UGNAME@ mode=@DSTMODE@
/set type=dir uname=root gname=@MTREE_GNAME@ mode=@DSTMODE@
.
man type=link link=share/man
..
doc/prefix.mtree.in
+1 -1
View File
@@ -1,6 +1,6 @@
# MacPorts filesystem hierarchy, for internal use only. Changes to this file will not stick across installations.
/set type=dir @MTREE_UGNAME@ mode=@DSTMODE@
/set type=dir uname=root gname=@MTREE_GNAME@ mode=@DSTMODE@
.
bin
..