From nobody Tue Jun 08 17:54:41 2021 X-Original-To: freebsd-current@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 64A7511C8D73 for ; Tue, 8 Jun 2021 17:54:43 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FzyYb2KT5z3vlM; Tue, 8 Jun 2021 17:54:43 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro.local (ralph.baldwin.cx [66.234.199.215]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id B58D4AB60; Tue, 8 Jun 2021 17:54:42 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Subject: Re: Files in /etc containing empty VCSId header To: Ian Lepore , Warner Losh Cc: Michael Gmelin , "freebsd-current@freebsd.org" References: <20210520183705.3673dfb2@bsd64.grem.de> <2bd37d63-1806-b621-a32b-954c912bd16b@FreeBSD.org> <2a280bc83d9a6289b3443329eb15bb0cb6c75063.camel@freebsd.org> From: John Baldwin Message-ID: Date: Tue, 8 Jun 2021 10:54:41 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:78.0) Gecko/20100101 Thunderbird/78.10.0 List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@freebsd.org MIME-Version: 1.0 In-Reply-To: <2a280bc83d9a6289b3443329eb15bb0cb6c75063.camel@freebsd.org> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-ThisMailContainsUnwantedMimeParts: N On 6/7/21 12:58 PM, Ian Lepore wrote: > On Mon, 2021-06-07 at 13:53 -0600, Warner Losh wrote: >> On Mon, Jun 7, 2021 at 12:26 PM John Baldwin wrote: >> >>> On 5/20/21 9:37 AM, Michael Gmelin wrote: >>>> Hi, >>>> >>>> After a binary update using freebsd-update, all files in /etc >>>> contain >>>> "empty" VCS Id headers, e.g., >>>> >>>> $ head /etc/nsswitch.conf >>>> # >>>> # nsswitch.conf(5) - name service switch configuration file >>>> # $FreeBSD$ >>>> # >>>> group: compat >>>> group_compat: nis >>>> hosts: files dns >>>> netgroup: compat >>>> networks: files >>>> passwd: compat >>>> >>>> After migrating to git, I would've expected those to contain >>>> something >>>> else or disappear completely. Is this expected and are there any >>>> plans >>>> to remove them completely? >>> >>> I believe we might eventually remove them in the future, but doing >>> so >>> right now would introduce a lot of churn and the conversion to git >>> had enough other churn going on. >>> >> >> We'd planned on not removing things that might be merged to stable/12 >> since >> those releases (12.3 only I think) will be built out of svn. We'll >> likely >> start to >> remove things more widely as the stable/12 branch reaches EOL and >> after. >> >> Warner > > It would be really nice if, instead of just deleting the $FreeBSD$ > markers, they could be replaced with the path/filename of the file in > the source tree. Sometimes it's a real interesting exercise to figure > out where a file on your runtime system comes from in the source world. > All the source tree layout changes that happened for packaged-base > makes it even more interesting. My hope is that we un-break src/etc. :( A few folks have looked at doing that (notably Kyle). -- John Baldwin