git: 3fbe3365df59 - stable/13 - Fix mtree for usr/
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 15 Jun 2022 20:43:17 UTC
The branch stable/13 has been updated by dim:
URL: https://cgit.FreeBSD.org/src/commit/?id=3fbe3365df59f9b973c7b5bc8e82e13199ab5057
commit 3fbe3365df59f9b973c7b5bc8e82e13199ab5057
Author: Xin LI <delphij@FreeBSD.org>
AuthorDate: 2022-06-12 04:37:15 +0000
Commit: Dimitry Andric <dim@FreeBSD.org>
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
- ..
..
..
..