From nobody Mon Jun 13 14:45:09 2022 X-Original-To: dev-commits-src-main@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 6928C8414D1; Mon, 13 Jun 2022 14:45:18 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from anubis.delphij.net (anubis.delphij.net [64.62.153.212]) (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 "anubis.delphij.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LMDrF44Mnz4SwG; Mon, 13 Jun 2022 14:45:17 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from [10.0.0.2] (c-141-193-140-252.rev.sailinternet.net [141.193.140.252]) by anubis.delphij.net (Postfix) with ESMTPSA id EE93F3C7DB; Mon, 13 Jun 2022 07:45:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=delphij.net; s=m7e2; t=1655131510; x=1655145910; bh=alb6aPrrMNqkE9uxP2wRDZ3PAf2G0Tbxuo0DUlJqfDw=; h=Date:Reply-To:To:Cc:References:From:Subject:In-Reply-To; b=l9sKwXQ0nmky7nUzd/Xr6hmDjHqoIfcIYmnsefKJfbD2zZnBAlqhecAAdVh1CN6yQ ZMHZLRm2zgUmTT4clRYBIsRaUOnyDoggHtdxq1dTlyiRdj4uD6UOOXZJvyguEY//zW dbzVI0YghPOr+F4YqBfMs7AxKVN0Of3UqyGrYbF4lH9FWnrLCbeK1ketGk09EuUY54 S+OYTHWMUWlMSDLUc4x4GWc6lSfEjehSLiwHVV2RP9mHD0/w1NCetx9D//CMalcG7j ZhnkKyzK3jU71yrbB+PkhJ/UefKnzByndgxNybKhDPujyRwb9D70/TJ5T3MvaETjPJ nSoLMl7clr34w== Message-ID: <34b14fc7-a070-9922-4796-a1b0a64b4fc7@delphij.net> Date: Mon, 13 Jun 2022 07:45:09 -0700 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Reply-To: d@delphij.net Content-Language: en-US To: Dimitry Andric , Xin LI Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" References: <202206120440.25C4eRl4078291@gitrepo.freebsd.org> <7BF2DCD4-C7CB-46C5-B885-EAF7BA7C5263@FreeBSD.org> <96909128-F515-4C51-A959-2F65A2C84BE5@FreeBSD.org> From: Xin Li Organization: The FreeBSD Project Subject: Re: git: 695052e240c7 - main - Fix mtree for usr/ In-Reply-To: <96909128-F515-4C51-A959-2F65A2C84BE5@FreeBSD.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4LMDrF44Mnz4SwG X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=delphij.net header.s=m7e2 header.b=l9sKwXQ0; dmarc=pass (policy=reject) header.from=delphij.net; spf=pass (mx1.freebsd.org: domain of delphij@delphij.net designates 64.62.153.212 as permitted sender) smtp.mailfrom=delphij@delphij.net X-Spamd-Result: default: False [-3.90 / 15.00]; HAS_REPLYTO(0.00)[d@delphij.net]; TO_DN_EQ_ADDR_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+mx]; RCPT_COUNT_FIVE(0.00)[5]; HAS_ORG_HEADER(0.00)[]; DKIM_TRACE(0.00)[delphij.net:+]; DMARC_POLICY_ALLOW(-0.50)[delphij.net,reject]; NEURAL_HAM_SHORT(-0.90)[-0.904]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:6939, ipnet:64.62.128.0/18, country:US]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[delphij.net:s=m7e2]; FREEFALL_USER(0.00)[delphij]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; REPLYTO_DOM_EQ_FROM_DOM(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all,dev-commits-src-main]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.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? :) 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...)