From nobody Fri Dec 31 18:18:53 2021 X-Original-To: dev-commits-src-all@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 2CF67192524F; Fri, 31 Dec 2021 18:18:54 +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 4JQYLP6TL9z3kXj; Fri, 31 Dec 2021 18:18:53 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 BADB579FC; Fri, 31 Dec 2021 18:18:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BVIIrl8048143; Fri, 31 Dec 2021 18:18:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BVIIr2P048142; Fri, 31 Dec 2021 18:18:53 GMT (envelope-from git) Date: Fri, 31 Dec 2021 18:18:53 GMT Message-Id: <202112311818.1BVIIr2P048142@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: daf481f3d508 - main - rescue: include ping iff at least one of INET & INET6 is enabled List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: daf481f3d508e7497b456e8df7db17c90b623ee0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640974733; 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=C17Z2lXHjiE/jCKXjxfjO/LkAwMJtrsXbW4NnwTdEKY=; b=tjGNHSeOSxkn/vtdykHGwBr+wBjcrEpBw0gN/d1cgnfP0COjBI9ZPNft8pn8RcyKUKkMky ArjFiXtBdcO9yK5a2ZCGHdJgJOHLlDur7ZIvwKKx5cxY9SpXQzFUyzjToHIAajdM1tJToG N+EdzJ/fLXyI12P029TEKKrWfmTmfQVWpF0gS9JbFO90g+31zc1o8Tgp2ThstPDq4oAOxu OOYrVyq7OvUtXqLoGhH9KPFDyJpI0faNaSa2VNh6DtWVODS+IwFnC6/RFYu9AgctJ1oBvD ktK2LVRQdXFBcoPRYh65F9Q+wEwt8s4XRzR1xF8/Q6KzP74CeAD8S/5fyzAExA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640974733; a=rsa-sha256; cv=none; b=CbF2JysiEIwEE7vOh6HA1nuiZP/AGWKQpHcXhM4HlXUczdIU2lKMe53p1u1ByWxhvOrju2 qeKEDjnfKXtgUXmCDJ6JRsp2KL3crl/zdL8fSbkkUQ9JCtzcPO4bpuKPt1o5PoRZHjpjUm 3PFUrfn+FK+ymp0BM9wc7A7CBJuj5udjcaUkCMLPa1wYH/iaD8L6N/TNfvD+44k98Y5Z+N 0FrhACl0G4UwbwTkJFuGB+Nxd7dH5QkkBSUnbMrplO4kMkSpUG2TlcKm/SXX1c8v2SS3hS Y1ns2ljUAmm9fKd83p1Q8khMCcAu2ajqiOek//KECwW3dTwMRu/JwrWcEW+96g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=daf481f3d508e7497b456e8df7db17c90b623ee0 commit daf481f3d508e7497b456e8df7db17c90b623ee0 Author: Ed Maste AuthorDate: 2021-12-31 01:11:31 +0000 Commit: Ed Maste 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