Date: Fri, 31 Dec 2021 18:18:53 GMT From: Ed Maste <emaste@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: daf481f3d508 - main - rescue: include ping iff at least one of INET & INET6 is enabled Message-ID: <202112311818.1BVIIr2P048142@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=daf481f3d508e7497b456e8df7db17c90b623ee0 commit daf481f3d508e7497b456e8df7db17c90b623ee0 Author: Ed Maste <emaste@FreeBSD.org> AuthorDate: 2021-12-31 01:11:31 +0000 Commit: Ed Maste <emaste@FreeBSD.org> CommitDate: 2021-12-31 18:16:30 +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 --- rescue/rescue/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index 783b5bbd7721..938712371061 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -99,7 +99,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 swapon sysctl tunefs umount @@ -107,6 +107,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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112311818.1BVIIr2P048142>