The branch stable/13 has been updated by emaste:

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

commit db9863a7975ddc22609c07e7273790c852efd8b6
Author:     Ed Maste <[email protected]>
AuthorDate: 2021-12-31 01:11:31 +0000
Commit:     Ed Maste <[email protected]>
CommitDate: 2023-09-24 15:48:33 +0000

    rescue: include ping iff at least one of INET & INET6 is enabled
    
    Ping does not build (and serves no purpose) if neither is enabled
    (i.e., building WITHOUT_INET and WITHOUT_INET6).
    
    This is equvalent to a4ef9e58bc0c but for rescue/.
    
    PR:             260082
    Fixes:          a4ef9e58bc0c ("sbin: build ping if at least one of...")
    Sponsored by:   The FreeBSD Foundation
    
    (cherry picked from commit daf481f3d508e7497b456e8df7db17c90b623ee0)
---
 rescue/rescue/Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
index fc5e54adacf0..92411336b83f 100644
--- a/rescue/rescue/Makefile
+++ b/rescue/rescue/Makefile
@@ -105,7 +105,7 @@ CRUNCH_PROGS_sbin=                                          
\
        md5 mdconfig mdmfs mknod mount mount_cd9660             \
        mount_msdosfs mount_nfs mount_nullfs                    \
        mount_udf mount_unionfs newfs                           \
-       newfs_msdos nos-tun ping reboot                         \
+       newfs_msdos nos-tun reboot                              \
        restore rcorder route savecore                          \
        shutdown spppcontrol swapon sysctl tunefs umount
 
@@ -113,6 +113,10 @@ CRUNCH_PROGS_sbin=                                         
        \
 CRUNCH_PROGS_sbin+= ccdconfig
 .endif
 
+.if ${MK_INET} != "no" || ${MK_INET6} != "no"
+CRUNCH_PROGS_sbin+= ping
+.endif
+
 .if ${MK_INET6_SUPPORT} != "no"
 CRUNCH_ALIAS_ping= ping6
 CRUNCH_PROGS_sbin+= rtsol

Reply via email to