From nobody Wed Jun 15 20:43:17 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 BD81685D46C; Wed, 15 Jun 2022 20:43:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LNchP4zv6z4SlH; Wed, 15 Jun 2022 20:43:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655325797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h1L6PnO6OF8VwNuFhyBfWp4tEUcZ63p253tWVUcJjO4=; b=fgKwa8LSjL8+YCGsha1xVM4d+AWKbo6uAOusFFVC8DGqyLWG7+x+CoxXK7f+oQw8z3Pzmh IjJ/H+Wa7uQV+eUFR6wDnLaIHg3xnq/Ht15i5b4vIitwVn2P1gT3no7Fy/zQUq3q8c1Vf/ eElLZQWFfO3ybU6sjWYqOVd1gXPLWirW59nlRF8am6G4/gAKtBh7nrj0EVGVWHod/gNWkO Y9+y1fhy7RAXAUcX6oNsqx8acii1EXmkplVEcJ7wHZ9l7RdL8JNm5QF2ehP3kXjfRyHz+f lPe0u/zuNJREl7OcnzecnrvooVrStzDSipkEN9vc15V7QsGfpxZq6To7Jtxugw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8B57925A6C; Wed, 15 Jun 2022 20:43:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25FKhHKo003407; Wed, 15 Jun 2022 20:43:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25FKhHVr003406; Wed, 15 Jun 2022 20:43:17 GMT (envelope-from git) Date: Wed, 15 Jun 2022 20:43:17 GMT Message-Id: <202206152043.25FKhHVr003406@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 3fbe3365df59 - stable/13 - Fix mtree for usr/ 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-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3fbe3365df59f9b973c7b5bc8e82e13199ab5057 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655325797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h1L6PnO6OF8VwNuFhyBfWp4tEUcZ63p253tWVUcJjO4=; b=wA460gfK5o1COSSGf9ZgcUCYZ/ySSpqStFv9Q+qo2AhfQGBY416imNakghyesn5z8f2tOe kzzMUvWgY0+2BmJsKYXcpTpq8H2j/WpOy/C4JlsKaUB2EZVkyWIznCHpFvt5N+9sUwVQ2I G8fboxzfxakl8UTUoDh4vnm5BqA/tUpO5j7YSjVvW3rLHq4XmrQCktc3Y+s4yQACrYUSpg 5SBydZtNA3PrxO9ABi0JNaeKCsxnlGgYR5VPkImjubhgYNaWEhv1op1+xLJvezlm+W61ar tepPxMtB5HS86bO2cTVH/x3pJ0kWMcUS5W7HE4IJrSM3uOq0nirk7vIKy5Sw0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655325797; a=rsa-sha256; cv=none; b=gbU8Lq3UZaJsq3UNB+AB71TEUp/Lx6VPWXFGxe8p8Uzr5fFU9rvxodwOzhS6aUmkBKhSXu +5L0JBAEIJ0zDlecK/PIolyRfOvrfZC+We0FBxWVyVzBg2Oob6zjUqN3ofi0EF3XFTTDdm 2IQxEftVkco+zFEPknWf4xFJiE5GSE6nhaIllVtrCIvjTjPiYAQy0JY3inx3bkV7o9dl0b TS5GTlcQZfpunjYFK3PQ1nJJtkejl0+OMj0eodvFHbrsQU05R48VREtuDbhxEyGTTanr7o df29DIFAAV1GZl1Lk2sGTRlupprUlIEXIy+Mf76LPq8hF5BIfIfvFNp9qF4JBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=3fbe3365df59f9b973c7b5bc8e82e13199ab5057 commit 3fbe3365df59f9b973c7b5bc8e82e13199ab5057 Author: Xin LI AuthorDate: 2022-06-12 04:37:15 +0000 Commit: Dimitry Andric CommitDate: 2022-06-15 20:41:10 +0000 Fix mtree for usr/ MFC after: 3 days (cherry picked from commit 695052e240c7c4291707a55358fe79de9ef79767) Account for missing `..' in BSD.usr.dist for clang 14.0.3. MFC after: 3 days (cherry picked from commit 1d25053e9365e99a2d16f2ee64d3416f14f7f167) Remove yet another incorrect .. level from BSD.usr.dist Since the spacing was off, it was not clear that it descended one level too many. Fixes: 695052e240c7 MFC after: 3 days (cherry picked from commit 987d26ee3f7a1685f7070db834478964170b6f62) --- ObsoleteFiles.inc | 1 + etc/mtree/BSD.usr.dist | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index e9d3a7b61b7a..12864a13f153 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -340,6 +340,7 @@ OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-profiling-armhf.a OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-profiling-x86_64.a OLD_FILES+=usr/lib/clang/14.0.3/lib/freebsd/libclang_rt.xray-x86_64.a OLD_DIRS+=usr/lib/clang/14.0.3/lib/freebsd +OLD_DIRS+=usr/lib/clang/14.0.3/lib/share OLD_DIRS+=usr/lib/clang/14.0.3/lib OLD_FILES+=usr/lib/clang/14.0.3/share/asan_ignorelist.txt OLD_FILES+=usr/lib/clang/14.0.3/share/cfi_ignorelist.txt diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index b0b1329840b0..80e54784d920 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -55,8 +55,8 @@ lib freebsd .. + .. share - .. .. .. ..