git: 773606fcdfae - main - ofwdump: install dependent on MK_FDT

The branch main has been updated by mhorne:

URL: https://cgit.FreeBSD.org/src/commit/?id=773606fcdfae00a3f850bcd39969a63d9a8fb129

commit 773606fcdfae00a3f850bcd39969a63d9a8fb129
Author:     Mitchell Horne <mhorne@FreeBSD.org>
AuthorDate: 2023-10-02 13:40:18 +0000
Commit:     Mitchell Horne <mhorne@FreeBSD.org>
CommitDate: 2023-10-02 13:40:18 +0000

    ofwdump: install dependent on MK_FDT
    
    The utility depends on the presence of the openfirm(4) pseudo-device,
    which is gated by the FDT kernel option. The MK_FDT knob is correctly
    set to "yes" for FDT/OFW-enabled platforms (powerpc* included); use it
    to install the utility and eliminate the arch-specific Makefile logic.
    
    No functional change intended.
    
    Reviewed by:    emaste, pkubaj
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D41977
---
 tools/build/mk/OptionalObsoleteFiles.inc | 1 +
 usr.sbin/Makefile                        | 1 +
 usr.sbin/Makefile.aarch64                | 1 -
 usr.sbin/Makefile.arm                    | 2 --
 usr.sbin/Makefile.powerpc                | 1 -
 usr.sbin/Makefile.riscv                  | 2 --
 6 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 9af0a319171a..fb22d56d53e0 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -2016,6 +2016,7 @@ OLD_DIRS+=usr/share/examples/ypldap
 .endif
 
 .if ${MK_FDT} == no
+OLD_FILES+=usr/sbin/ofwdump
 OLD_FILES+=usr/share/man/man8/ofwdump.8.gz
 .endif
 
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index b836bd412077..ca8b87a134eb 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -133,6 +133,7 @@ SUBDIR.${MK_EFI}+=	efivar efidp efibootmgr efitable efiwake
 .if ${MK_OPENSSL} != "no"
 SUBDIR.${MK_EFI}+=	uefisign
 .endif
+SUBDIR.${MK_FDT}+=	ofwdump
 SUBDIR.${MK_FLOPPY}+=	fdcontrol
 SUBDIR.${MK_FLOPPY}+=	fdformat
 SUBDIR.${MK_FLOPPY}+=	fdread
diff --git a/usr.sbin/Makefile.aarch64 b/usr.sbin/Makefile.aarch64
index e819369f4340..a72a085ff618 100644
--- a/usr.sbin/Makefile.aarch64
+++ b/usr.sbin/Makefile.aarch64
@@ -2,4 +2,3 @@
 .if ${MK_ACPI} != "no"
 SUBDIR+=	acpi
 .endif
-SUBDIR+=	ofwdump
diff --git a/usr.sbin/Makefile.arm b/usr.sbin/Makefile.arm
deleted file mode 100644
index 3767c8c9e1ca..000000000000
--- a/usr.sbin/Makefile.arm
+++ /dev/null
@@ -1,2 +0,0 @@
-
-SUBDIR+=	ofwdump
diff --git a/usr.sbin/Makefile.powerpc b/usr.sbin/Makefile.powerpc
index a6d5b3b35ad4..d6b05857e152 100644
--- a/usr.sbin/Makefile.powerpc
+++ b/usr.sbin/Makefile.powerpc
@@ -2,4 +2,3 @@
 .if ${MACHINE_ARCH} != "powerpcspe"
 SUBDIR+=	nvram
 .endif
-SUBDIR+=	ofwdump
diff --git a/usr.sbin/Makefile.riscv b/usr.sbin/Makefile.riscv
deleted file mode 100644
index 3767c8c9e1ca..000000000000
--- a/usr.sbin/Makefile.riscv
+++ /dev/null
@@ -1,2 +0,0 @@
-
-SUBDIR+=	ofwdump