svn commit: r289085 - head/share/mk

[Baptiste Daroussin]

On Sun, Oct 11, 2015 at 10:41:09PM +0200, Jan Beich wrote:
> Baptiste Daroussin <bapt at FreeBSD.org> writes:
> 
> > +++ head/share/mk/bsd.confs.mk	Fri Oct  9 21:57:42 2015	(r289085)
> [...]
> > +CONFGROUPS?=	CONFS
> [...]
> > +.error bsd.conf.mk cannot be included directly.
> > +.for group in ${CONFSGROUPS}
> 
> Typo: plural vs. singular
> 
> [...]
> > +${group}OWN?=	${SHAREOWN}
> > +${group}GRP?=	${SHAREGRP}
> > +${group}MODE?=	${SHAREMODE}
> > +${group}DIR?=	${ETCDIR}/
> 
> Have you considered patching bsd.files.mk instead of copying it just to
> modify a few defaults? For one, bsd.confs.mk lacks r257095, r267276,
> r284345, r287185 - anything from a few years ago.

Yes I planned to merge, bsd.confs.mk was temporary to quickly unlock me on my
work on packaging base.
> 
> Here's a quick attempt to merge changes back. Due to .mk files being
> out of sync I may have missed some.
> 
> $ svn patch /path/to/below.diff
> $ rm -f /usr/share/mk/bsd.files.mk
> $ make -s install -C share/mk
> $ make -sj2 all -C libexec/dma/dmagent
> $ make -j2 install -C libexec/dma/dmagent

That misses the point, the goal here is explicitly not to install the
configuration files during make install, but only when one call make
installconfig which I have hoocked to make distribution (in Makefile.inc1) to
allow mergemaster/etcupdate to continue being able to merge them after
installing them into a temporary destdir.

Best regards,
Bapt
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-src-head/attachments/20151011/147c2853/attachment.bin>