From nobody Tue Jun 14 00:47:30 2022 X-Original-To: dev-commits-src-all@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 ED8C5836566; Tue, 14 Jun 2022 00:47:43 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4LMVCM44JMz3H2c; Tue, 14 Jun 2022 00:47:43 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id 25E0lUh3023901; Mon, 13 Jun 2022 17:47:30 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id 25E0lUqI023900; Mon, 13 Jun 2022 17:47:30 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <202206140047.25E0lUqI023900@gndrsh.dnsmgr.net> Subject: Re: git: 695052e240c7 - main - Fix mtree for usr/ In-Reply-To: <34b14fc7-a070-9922-4796-a1b0a64b4fc7@delphij.net> To: d@delphij.net Date: Mon, 13 Jun 2022 17:47:30 -0700 (PDT) CC: Dimitry Andric , Xin LI , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 4LMVCM44JMz3H2c X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: N > > On 6/12/22 07:26, Dimitry Andric wrote: > > On 12 Jun 2022, at 10:49, Dimitry Andric wrote: > >> > >> On 12 Jun 2022, at 06:40, Xin LI wrote: > >>> > >>> The branch main has been updated by delphij: > >>> > >>> URL: https://cgit.FreeBSD.org/src/commit/?id=695052e240c7c4291707a55358fe79de9ef79767 > >>> > >>> commit 695052e240c7c4291707a55358fe79de9ef79767 > >>> Author: Xin LI > >>> AuthorDate: 2022-06-12 04:37:15 +0000 > >>> Commit: Xin LI > >>> CommitDate: 2022-06-12 04:38:05 +0000 > >>> > >>> Fix mtree for usr/ > >>> > >>> MFC after: 3 days > >>> --- > >>> etc/mtree/BSD.usr.dist | 1 + > >>> 1 file changed, 1 insertion(+) > >>> > >>> diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist > >>> index 92ed996d4b39..9f934976b77e 100644 > >>> --- a/etc/mtree/BSD.usr.dist > >>> +++ b/etc/mtree/BSD.usr.dist > >>> @@ -57,6 +57,7 @@ > >>> lib > >>> freebsd > >>> .. > >>> + .. > >>> share > >>> .. > >>> .. > >> > >> Thanks! Apologies for the mistake, I always have trouble with the mtree format. :) > > > > Now that I'm looking at the file *again* I think that: > > > > lib > > freebsd > > .. > > .. > > share > > .. > > .. > > > > should really be: > > > > lib > > freebsd > > .. > > .. > > share > > .. > > > > because otherwise it is descending one level too far? > > > > Is there any sort of "sanity checker" for these files? :) Have you read the README file in the mtree directory? > Awww... my bad. (I usually used mtree to generate a new one and then > merge them into the existing .dist files, but looks like some recent > mtree change have modified the generated format...) Oh, thats bad news. -- Rod Grimes rgrimes@freebsd.org