From owner-svn-src-head@freebsd.org Sun Oct 11 21:49:10 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3F5B69B1E72; Sun, 11 Oct 2015 21:49:10 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: from mail-wi0-x22f.google.com (mail-wi0-x22f.google.com [IPv6:2a00:1450:400c:c05::22f]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DCF8D19D8; Sun, 11 Oct 2015 21:49:09 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: by wiclk2 with SMTP id lk2so130554124wic.1; Sun, 11 Oct 2015 14:49:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=hBZE3K4j3ugHOam1q84Ng75EvA0B60u8K2/5tBLnNOw=; b=mz20VLdQdG3JkywJXiltTNnVqTJs8UeRY5lkGvbvf5sJSQr58zbzXDy2OYXqTsl4O4 Xg5o/oiToq/naeSMXz7WxknEulv0LMqhB1Mbf7ADTnIkO9xR2+nnjXf+ENdzfiRHZOMc KoTYASZ0ZllBkwqw365iyZZ2RLBGL3a0M5mjyRAFLe7o1UzXST8+FKtY//vTwwuZs2DY mALdychIrtg3x3K5RVXDdkbl00IOLgpiT8k1rhmaUgLSpO4b/2Kp6IuNAogzjgIWvNGW 3gqgC3UrtxVVq+HRDgGn3phBKwXkenhdvdodfmCLQX06hrE1PmDXn/iNlFk9y7xIJaqo W35g== X-Received: by 10.180.90.229 with SMTP id bz5mr11617246wib.46.1444600148442; Sun, 11 Oct 2015 14:49:08 -0700 (PDT) Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1]) by smtp.gmail.com with ESMTPSA id gl4sm3226299wjd.49.2015.10.11.14.49.07 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Oct 2015 14:49:07 -0700 (PDT) Sender: Baptiste Daroussin Date: Sun, 11 Oct 2015 23:49:06 +0200 From: Baptiste Daroussin To: Jan Beich 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> References: <201510092157.t99Lvgfu022041@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="96icqjDFsSi85SgI" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.24 (2015-08-30) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Oct 2015 21:49:10 -0000 --96icqjDFsSi85SgI Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Oct 11, 2015 at 10:41:09PM +0200, Jan Beich wrote: > Baptiste Daroussin writes: >=20 > > +++ head/share/mk/bsd.confs.mk Fri Oct 9 21:57:42 2015 (r289085) > [...] > > +CONFGROUPS?=3D CONFS > [...] > > +.error bsd.conf.mk cannot be included directly. > > +.for group in ${CONFSGROUPS} >=20 > Typo: plural vs. singular >=20 > [...] > > +${group}OWN?=3D ${SHAREOWN} > > +${group}GRP?=3D ${SHAREGRP} > > +${group}MODE?=3D ${SHAREMODE} > > +${group}DIR?=3D ${ETCDIR}/ >=20 > 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. >=20 > Here's a quick attempt to merge changes back. Due to .mk files being > out of sync I may have missed some. >=20 > $ 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 --96icqjDFsSi85SgI Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEARECAAYFAlYa2U8ACgkQ8kTtMUmk6Ey/pgCeNE7kKAC+m4pybN4RGpcjUxCi N/8An2LtL/BnYj9Jetb+wWwuRVDOmuCg =3Zef -----END PGP SIGNATURE----- --96icqjDFsSi85SgI--