From nobody Sun Jun 12 15:13:18 2022 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 6AD9083F294 for ; Sun, 12 Jun 2022 15:13:30 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-vk1-xa32.google.com (mail-vk1-xa32.google.com [IPv6:2607:f8b0:4864:20::a32]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LLdWF4QV2z3qqx for ; Sun, 12 Jun 2022 15:13:29 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-vk1-xa32.google.com with SMTP id g15so1628600vkm.0 for ; Sun, 12 Jun 2022 08:13:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=fxkKAEYPwepy+rzq35ozWqdUeTKAHY94+RKaXXnNi1g=; b=LuEebYp35RednWir0hTHC1hiTrBJJainNrqQx+Z/zVqhWuMzWMmatHX441VyHr053F qTr4diiCaHt2DHt9xIBXGJORu4YYCibE4Bnd6vAr8IW8pahxa/WCtLUV0kc0PmCDm53e agRi1lOkxXIKQVjxX16vfXDM9Vjxx7nWRvOi07D0cona12LxfKVlo0sTZt2p262282Ks 1iD6j0dNwVVLqkiQB36pCUeLyrow/jBeODnd+tXuL4afNhFSGsg5q6GxozOsKUtIWyu6 JLd0mYOCiJ0j9sDgQHiozUYdj0G/uO+96h/E1b1dNUJ8QR7mJj269VduG04XcFhnMj/9 KlFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=fxkKAEYPwepy+rzq35ozWqdUeTKAHY94+RKaXXnNi1g=; b=Fj8Z1vETi0EUMRK/xvjb0vByEudx98OqBYiCgo54mtKqqDfKMokNH34kUgygECYTPm YaL9Umb4R2otYgIQBjXv4yqYe0+iUQcxH9eh2BhIPGUMoj3j+Alq0uu3wX5sZVFmudQR cxuclOe8sSGAsy+obCsDz2q4fZ9aZFUP9Fb7v0F9CIlBi8bC1ESdhbH6p7kxWiVrH5Ex AXc/gdOzTYMKR9g80o/schcD+Rt1PJpZqucpw1yCKITzvuuBRTv62/4HaQRDgLhuSX29 47Y+n7ALsJ2UrRjO29fTlfb60wczLPtbG49J5q5zbr5zMv/HO/IJ3Bav0WAtqan2A9wQ Dt9Q== X-Gm-Message-State: AOAM532tg2OiCVKuh/XGuTRLfQTtUOBlbepP2392NEAPAaOGzm8TIBEh 12oKIol33wfF6z44+mG88NK6n+gfI54RCiS3p4KVuA== X-Google-Smtp-Source: ABdhPJy1sk4c+Swm40MlsccBFPk9Zrt2jrAjbvp+jgKX7g+wfCaVJecQfUoKAGxgOYNvoA4s1/RmuYtRZ/ESpUxWR2E= X-Received: by 2002:a1f:18d6:0:b0:35d:7d52:fbbe with SMTP id 205-20020a1f18d6000000b0035d7d52fbbemr18238137vky.32.1655046809051; Sun, 12 Jun 2022 08:13:29 -0700 (PDT) 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 References: In-Reply-To: From: Warner Losh Date: Sun, 12 Jun 2022 09:13:18 -0600 Message-ID: Subject: Re: commit 695052e is incomplete To: Michael Butler Cc: Xin LI , freebsd-current Content-Type: multipart/alternative; boundary="00000000000024018005e1419d90" X-Rspamd-Queue-Id: 4LLdWF4QV2z3qqx X-Spamd-Bar: + Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20210112.gappssmtp.com header.s=20210112 header.b=LuEebYp3; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::a32) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [1.44 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20210112.gappssmtp.com:s=20210112]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-current@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; NEURAL_SPAM_MEDIUM(1.00)[0.998]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20210112.gappssmtp.com:+]; NEURAL_SPAM_LONG(1.00)[0.999]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::a32:from]; NEURAL_HAM_SHORT(-0.56)[-0.556]; MLMMJ_DEST(0.00)[freebsd-current]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; R_SPF_NA(0.00)[no SPF record]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_COUNT_TWO(0.00)[2]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com] X-ThisMailContainsUnwantedMimeParts: N --00000000000024018005e1419d90 Content-Type: text/plain; charset="UTF-8" This was just fixed minutes ago... please update and confirm the fix is good. Warner On Sun, Jun 12, 2022, 9:09 AM Michael Butler wrote: > After 695052e, the directories compat, dtrace, engines, flua, i18n and > libxo now get created under /usr. This is one level higher than they > should be. > > The fix appears to be something like .. > > diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist > index 9f934976b77..95a711a4418 100644 > --- a/etc/mtree/BSD.usr.dist > +++ b/etc/mtree/BSD.usr.dist > @@ -59,7 +59,6 @@ > .. > .. > share > - .. > .. > .. > .. > > > --00000000000024018005e1419d90 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
This was just fixed minutes ago... please update and conf= irm the fix is good.

Warner=C2= =A0

On Sun, Jun 12, 2022, 9:09 AM Michael Butler <imb@protected-networks.net> wrote:
<= /div>
After 695052e, the directories compat, = dtrace, engines, flua, i18n and
libxo now get created under /usr. This is one level higher than they
should be.

The fix appears to be something like ..

diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 9f934976b77..95a711a4418 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -59,7 +59,6 @@
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 ..
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ..
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 share
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 .. =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ..
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ..
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ..


--00000000000024018005e1419d90--