Date: Fri, 25 May 2018 14:10:20 -0700 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Brad Davis <brd@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r333407 - head/share/mk Message-ID: <88989fda-4d0b-af16-8d08-28b6cdba0d34@FreeBSD.org> In-Reply-To: <201805091344.w49Dist5061908@repo.freebsd.org> References: <201805091344.w49Dist5061908@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --22b1Za7qULLbYDKqE6Ar9axKfiB0ikgYH Content-Type: multipart/mixed; boundary="natiugY9Vw2GDyLnvO066LNJBisE4afca"; protected-headers="v1" From: Bryan Drewery <bdrewery@FreeBSD.org> To: Brad Davis <brd@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <88989fda-4d0b-af16-8d08-28b6cdba0d34@FreeBSD.org> Subject: Re: svn commit: r333407 - head/share/mk References: <201805091344.w49Dist5061908@repo.freebsd.org> In-Reply-To: <201805091344.w49Dist5061908@repo.freebsd.org> --natiugY9Vw2GDyLnvO066LNJBisE4afca Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 5/9/2018 6:44 AM, Brad Davis wrote: > Author: brd > Date: Wed May 9 13:44:54 2018 > New Revision: 333407 > URL: https://svnweb.freebsd.org/changeset/base/333407 >=20 > Log: > Enable directory creation with FILESDIR. > =20 > This is part of packaging base work. > =20 > Reviewed by: will > Approved by: bapt (mentor), allanjude (mentor) > Differential Revision: https://reviews.freebsd.org/D15130 >=20 Please update share/mk/bsd.README too. I know I haven't been very responsive but it's partly because I'm still fundamentally against this feature. It's adding a mechanism to replace mtree without considering the whole picture and only binding it to FILES rather than a bsd.dirs.mk; It doesn't actually satisfy replacing mtree files since it only works if there is a FILESGROUP used (FILES must be non-empty). So what's the point? My major concern is added confusion. The creation of directories for installing is a pain point at work for developers but I don't think this is enough. I liked the idea of `install "-D"` but I know it's not efficient and had some implementation issues. More below... > Modified: > head/share/mk/bsd.files.mk > head/share/mk/bsd.own.mk >=20 > Modified: head/share/mk/bsd.files.mk > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/share/mk/bsd.files.mk Wed May 9 12:25:23 2018 (r333406) > +++ head/share/mk/bsd.files.mk Wed May 9 13:44:54 2018 (r333407) > @@ -67,7 +67,7 @@ STAGE_AS_${file:T}=3D ${${group}NAME_${file:T}} > STAGE_DIR.${file:T}=3D ${STAGE_OBJTOP}${${group}DIR_${file:T}} > stage_as.${file:T}: ${file} > =20 > -installfiles-${group}: _${group}INS_${file:T} > +installfiles-${group}: installdirs-${group} _${group}INS_${file:T} > _${group}INS_${file:T}: ${file} > ${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN_${.ALLSRC:T}} \ > -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ > @@ -77,10 +77,24 @@ _${group}INS_${file:T}: ${file} > _${group}FILES+=3D ${file} > .endif > .endfor > + > + > +installdirs-${group}: > + @echo installing dirs ${group}DIR ${${group}DIR} > +.for dir in ${${group}DIR} > +.if defined(NO_ROOT) > + ${INSTALL} ${${group}TAG_ARGS} -d ${DESTDIR}${dir} > +.else > + ${INSTALL} ${${group}TAG_ARGS} -d -o ${DIROWN} -g ${DIRGRP} \ > + -m ${DIRMODE} ${DESTDIR}${dir} I missed this before but the OWN/GRP/MODE usage needs to be per group just like the FILES group ones are above; it needs to be able to modify the permissions per group rather than only using the globals. > +.endif > +.endfor > + > + > .if !empty(_${group}FILES) > stage_files.${group}: ${_${group}FILES} > =20 > -installfiles-${group}: _${group}INS > +installfiles-${group}: installdirs-${group} _${group}INS > _${group}INS: ${_${group}FILES} > .if defined(${group}NAME) > ${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN} -g ${${group}GRP} \ >=20 > Modified: head/share/mk/bsd.own.mk > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/share/mk/bsd.own.mk Wed May 9 12:25:23 2018 (r333406) > +++ head/share/mk/bsd.own.mk Wed May 9 13:44:54 2018 (r333407) > @@ -75,6 +75,13 @@ > # CONFMODE Configuration file mode. [644] > # > # > +# DIROWN Directory owner. [root] > +# > +# DIRGRP Directory group. [wheel] > +# > +# DIRMODE Directory mode. [755] > +# > +# > # DOCDIR Base path for system documentation (e.g. PSD, USD, > # handbook, FAQ etc.). [${SHAREDIR}/doc] > # > @@ -185,6 +192,10 @@ MANDIR?=3D ${SHAREDIR}/man/man > MANOWN?=3D ${SHAREOWN} > MANGRP?=3D ${SHAREGRP} > MANMODE?=3D ${NOBINMODE} > + > +DIROWN?=3D root > +DIRGRP?=3D wheel > +DIRMODE?=3D 755 > =20 > DOCDIR?=3D ${SHAREDIR}/doc > DOCOWN?=3D ${SHAREOWN} >=20 --=20 Regards, Bryan Drewery --natiugY9Vw2GDyLnvO066LNJBisE4afca-- --22b1Za7qULLbYDKqE6Ar9axKfiB0ikgYH Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJbCHu9AAoJEDXXcbtuRpfPjeQIAMnprIZUQb7S6H5z0Z1QItF+ pUqA3e/oO0ebn/hBRWRKAdUjo0NbR5mZ7dYQrAi/8OROxwkoZ5cSRraJYAuahE6a Poml4iTKBF+WSU4Brv88ImXMf03q3lVl1IFltPKaeukH+zyCiYbM14tqwtPAorZ6 iwFkLfgnEA4tofSBrs183XGNdAc/NZNTNXzI10yxmxZ8QsJRj7x81F7uVCSsRBUh ByTt2f/AqDm9a0Y9cm512UkY+SRzbIV8jghUhFFi8UtuSnKPgGOu5zTnyUZFaT14 bT2MXwM1+U/CwzllyauoDk59UyXG8Rd83O1fV2+fgYUYhU/PwoNMqeV6C3gTUwI= =7BFT -----END PGP SIGNATURE----- --22b1Za7qULLbYDKqE6Ar9axKfiB0ikgYH--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?88989fda-4d0b-af16-8d08-28b6cdba0d34>