git: 56a2b5d640f7 - stable/14 - ObsoleteFiles.inc: only leave ofwdump.8.gz when WITH_FDT is set
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 04 Oct 2023 00:42:44 UTC
The branch stable/14 has been updated by pkubaj:
URL: https://cgit.FreeBSD.org/src/commit/?id=56a2b5d640f71ce1630f923e562b5878e1b6f945
commit 56a2b5d640f71ce1630f923e562b5878e1b6f945
Author: Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2023-10-01 21:36:37 +0000
Commit: Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2023-10-04 00:42:32 +0000
ObsoleteFiles.inc: only leave ofwdump.8.gz when WITH_FDT is set
Approved by: mhorne
Differential Revision: https://reviews.freebsd.org/D41905
MFC after: 3 days
(cherry picked from commit 4cf8075264c9db8f3e39a1f17def58cda8803853)
---
ObsoleteFiles.inc | 5 -----
tools/build/mk/OptionalObsoleteFiles.inc | 4 ++++
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 589f6b968e9d..6f07b70494f8 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -17648,11 +17648,6 @@ OLD_FILES+=usr/share/man/man5/usbd.conf.5.gz
.if ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "amd64"
OLD_FILES+=usr/share/man/man8/boot_i386.8.gz
.endif
-.if ${TARGET_ARCH} != "aarch64" && ${TARGET} != "arm" && \
- ${TARGET_ARCH} != "powerpc" && ${TARGET_ARCH} != "powerpc64" && \
- ${TARGET_ARCH} != "sparc64" && ${TARGET} != "mips"
-OLD_FILES+=usr/share/man/man8/ofwdump.8.gz
-.endif
OLD_FILES+=usr/share/man/man8/mount_reiserfs.8.gz
OLD_FILES+=usr/share/man/man9/VFS_START.9.gz
OLD_FILES+=usr/share/man/man9/cpu_critical_exit.9.gz
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 82ea542d7f55..b782f8d102b0 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -2015,6 +2015,10 @@ OLD_DIRS+=usr/share/examples/uefisign
OLD_DIRS+=usr/share/examples/ypldap
.endif
+.if ${MK_FDT} == no
+OLD_FILES+=usr/share/man/man8/ofwdump.8.gz
+.endif
+
.if ${MK_FINGER} == no
OLD_FILES+=usr/bin/finger
OLD_FILES+=usr/share/man/man1/finger.1.gz