Date: Sun, 11 Oct 2015 23:49:06 +0200 From: Baptiste Daroussin <bapt@FreeBSD.org> To: Jan Beich <jbeich@vfemail.net> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r289085 - head/share/mk Message-ID: <20151011214903.GS91729@ivaldir.etoilebsd.net> In-Reply-To: <pp0l-t9y2-wny@vfemail.net> References: <201510092157.t99Lvgfu022041@repo.freebsd.org> <pp0l-t9y2-wny@vfemail.net>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
On Sun, Oct 11, 2015 at 10:41:09PM +0200, Jan Beich wrote:
> Baptiste Daroussin <bapt@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
[-- Attachment #2 --]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEARECAAYFAlYa2U8ACgkQ8kTtMUmk6Ey/pgCeNE7kKAC+m4pybN4RGpcjUxCi
N/8An2LtL/BnYj9Jetb+wWwuRVDOmuCg
=3Zef
-----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20151011214903.GS91729>