git: 0179739a0096 - main - OptionalObsoleteFiles: remove ping with INET & INET6 disabled

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Ed Maste <emaste_at_FreeBSD.org>
Date: Sun, 28 Nov 2021 18:25:53 UTC

The branch main has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=0179739a0096c62cb3c9665d68246046255ab849

commit 0179739a0096c62cb3c9665d68246046255ab849
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2021-11-28 18:23:29 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2021-11-28 18:23:29 +0000

    OptionalObsoleteFiles: remove ping with INET & INET6 disabled
    
    Reported by:    kevans
    Fixes:          a4ef9e58bc0c ("sbin: build ping if at least one of...")
    Sponsored by:   The FreeBSD Foundation
---
 tools/build/mk/OptionalObsoleteFiles.inc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 04addd495b67..f09029ef9b7c 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -2573,6 +2573,11 @@ OLD_DIRS+=usr/share/i18n/csmapper/KS
 OLD_DIRS+=usr/share/i18n/csmapper/GB
 .endif
 
+.if ${MK_INET} == no && ${MK_INET6} == no
+OLD_FILES+=sbin/ping
+OLD_FILES+=usr/share/man/man8/ping.8.gz
+.endif
+
 .if ${MK_INET6} == no
 OLD_FILES+=sbin/ping6
 OLD_FILES+=sbin/rtsol