From nobody Mon Oct 2 13:41:19 2023 X-Original-To: dev-commits-src-main@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 4Rzhtl6Ngkz4w5lZ; Mon, 2 Oct 2023 13:41:19 +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 4Rzhtl5pPPz3Ww9; Mon, 2 Oct 2023 13:41:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696254079; 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=lrT5bdAtR6+4DsSiUPVp1jk0I5dyhKpKUvT6c3ytH78=; b=DPbbuPiNLvb7LBiTIlvupcrTxAp/MBwH1DUZxpmFfp8imYR5RDjgUILyxyZa90kHfpsQ0B rn2zkXY4ow6gxL7P2hPOEXnnZbV/QLovMxxLoe1QzlCiqsF5Zc6p1zDuvJQOkNNYHWmBbo KQjEtlegu5C3T5wuLjvRDAnMa8+Q6FI1xUi3e6z89SWffCJO6VJbX42yI83uu8zjEgM+e9 04u8hkXLVPg1faVx9d8CtYxKrERwM+BMs3+O/EDeFQ5fKMEaiZiWJRUsxtKnL1OuioNU4Y TQTlAKeBYLgJ1IkrJhJO3ZW5KlT6Lp0SNQc+u1YHHxV1yZ6qJjK5jc5vXtJ/xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696254079; a=rsa-sha256; cv=none; b=cexxSguVbOFdlhf7hNvLvBKDz1jwMid0VcTzBR0kifb2bmDdbljH3CpXSu3HnnGctmV4th 4gcoFlbzKdXakHOuKvNeaVHrmdJhyJuplmWGqInLhKtDy0YumCXUteWBV5C5+zMvQalAMV Q0FFzQFllQIglIhI4YKjs0mBAA/0IUkdd5h1FtVZi3k+qH8DSLY9if2jVjOhUU+yPBBovS 6m03SyB5V6jouFK6okiTNb3N6RN9vfNqev0XjO3RgiqgWS5EpmIB7res4/oIsnVVqLkd+r EJ/+BH4YrBq/KbZEiaxp8iizSImWReBU8otEqjZX1MjWdFhIz2H7Vavs0C1nBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696254079; 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=lrT5bdAtR6+4DsSiUPVp1jk0I5dyhKpKUvT6c3ytH78=; b=fYt2tzoD3ENENpudx6+E+rS5TFft+FeXb4l93NtjosDEDwQcWGpogGw7sWeDzOxXEV8hxz G99L8nhDJUOaooT3PQLRk0yB2S4cUrQHyVEcCbAtNX0Yw1ZOiPAVkb3aI7g7J1Y1iC+mMZ JQGAudrNIpsnTvV3kmJMj/K36z6Pq8JwmYOsEDkMji3rKVu2MnI9HsNNIE7trzoeEkGOx9 Of0Q+vZHxG2BOtnyKcjHOvKrhF6giOZFNbTxqyU38v84rwKOSnRPRPUOKutIJM81rPbL3f VVufE0qVX2dyK5iKOlK6d4JiaMr83CIYHk7P25PchqJeMLkebcg7TFS+T8SDsA== 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 4Rzhtl4tDXzFn; Mon, 2 Oct 2023 13:41:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 392DfJ9T012864; Mon, 2 Oct 2023 13:41:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 392DfJAu012861; Mon, 2 Oct 2023 13:41:19 GMT (envelope-from git) Date: Mon, 2 Oct 2023 13:41:19 GMT Message-Id: <202310021341.392DfJAu012861@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 773606fcdfae - main - ofwdump: install dependent on MK_FDT List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 773606fcdfae00a3f850bcd39969a63d9a8fb129 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=773606fcdfae00a3f850bcd39969a63d9a8fb129 commit 773606fcdfae00a3f850bcd39969a63d9a8fb129 Author: Mitchell Horne AuthorDate: 2023-10-02 13:40:18 +0000 Commit: Mitchell Horne 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