From nobody Sun Sep 24 15:49:53 2023 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 4Rtr6n3LRZz4v7Kc; Sun, 24 Sep 2023 15:49:53 +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 4Rtr6n2rKXz3L3N; Sun, 24 Sep 2023 15:49:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695570593; 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=aGmKqAqDyn+NaQzJ7cRxudt84ggpvPY6kd0yxZyP2OA=; b=yLAcrywXMxkcN0VIAa5KSHgAsewsquOcahAQQIbwSsay39Pts0UDfwuEyCztUItdez/5mL VpRTEXbuQ0URd2RQj+Zt/poOb0sGqeWfMnVLxF2QH/eIGt98MaGxqK3/n/VEyrgTS8J6xJ yH47XoVqziZwPL35r6TaIJ0rAnlEfGjR6uCbY06Li1zv+VyT4XEu1WqZW2AvxP9oQRA11R ipRq/0n8cir+2vSBuPtDmJ3pspDaZFWuM9PA7oIl5EVWdEAjgseOFejAu2lvbayIE1t+N7 F+86P912O66onj6qD2dYPF2/lSxGGy6/wLn6e0+8w8iMUrN5/TUIfn/hTOSyXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695570593; a=rsa-sha256; cv=none; b=sAF6k2WGv5opJYOrGFLtFmuc+Mi2jEK1qIVWDhlhL6EqBrj45q8orfooyRZXFkzPsSah/q ImrJj5qutLiGrrcZ+EzcCNuYVPOUKxo8FJx/5NiZ03U7KvNimUIhnuKHDEg183pKAU8eey t3aB+bQz6WmxULSL2z74+9q0Mx+8wMbkGCSKtv0VJUIt9LNpEd1q3sdU/YOq4yz0bdP3Gk NMFB39j2Qlszequzwkv/0+uptEkftGJfOO6oO5wlUG6d+ImN3sRdHYhtWp/uG+PR196uTI PdngB+XErmf1R06WjuQB6RcIzAczX+ZiIv6zexe1lD7TlCavaZ+f1fRerYCq/w== 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=1695570593; 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=aGmKqAqDyn+NaQzJ7cRxudt84ggpvPY6kd0yxZyP2OA=; b=smjUwt9DYP4CmQs4CAj9n9T0bB/V1cXcPncK24D6qGF78Hruv36cgDiAmDdRjtNAuB6Wdu dQ27lIepgzHMMQz39/Ci0tKriTdQd2wjgPZNtVGp7x7cYW62XSD/rgKTq7n0xbxdsV50fw Uc4W1cJp+0lAi19Jqh0zgTAwpRNt2K71xJ3Xiyzq3V4igE/CSItseaOJW3Myvcnn1Q0P8c ymyb/cYFrBrMiFVVHmpgtSqf5wNpbcj3CmHr5axtQkaPZnhk3lUgfqHhZNBAv9vSBSzsDd UwKCoWZH8tuP0U6JszqrJlj2k1bt+Ui/rLCAkoMQSCuu+wj07voWAA132BagLQ== 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 4Rtr6n1tffzsfG; Sun, 24 Sep 2023 15:49:53 +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 38OFnrRH028658; Sun, 24 Sep 2023 15:49:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38OFnr1R028655; Sun, 24 Sep 2023 15:49:53 GMT (envelope-from git) Date: Sun, 24 Sep 2023 15:49:53 GMT Message-Id: <202309241549.38OFnr1R028655@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: db9863a7975d - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: db9863a7975ddc22609c07e7273790c852efd8b6 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=db9863a7975ddc22609c07e7273790c852efd8b6 commit db9863a7975ddc22609c07e7273790c852efd8b6 Author: Ed Maste AuthorDate: 2021-12-31 01:11:31 +0000 Commit: Ed Maste 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