From nobody Mon Nov 04 04:58:24 2024 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 4XhfPD6jsDz5c9MX; Mon, 04 Nov 2024 04:58:24 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XhfPD416Fz4fRc; Mon, 4 Nov 2024 04:58:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730696304; 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=fOfacUmnxGka7QG9vKw5MOpiL5wD3uehM9XEq4bVa6A=; b=VoBb9mQmbYOW3YERFYTX/xz2t2Bq9ms3VwuUBp1AOrJr24W9RIHV2eD67LJQ8rrBAwCv4x JYJ2J7ekkv5xVnJdBZDcpZp6NZd1ke+j616Y6FU1G5B+fb/yFeAWCAGD5w5aRbmNQyCbF1 td2K30WWR/2VBnDBN98E1c3y67iKXeDyhNZ2kbUHqwWUo7sbUmYPWzRxAsQnvZalfQjBSZ gPeVUTTuqbU2U9ehomQxJpbx+ENjkp4M+P6Qkz1Fnh31EFm9f3Z8UHkB4+ZhChZCv+oWHT XQBsnqfr/prGEXqUOOwcxhKD3vo2KIHwatM4acA2BM4Z8M45d+MUbqu8mGNE0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730696304; 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=fOfacUmnxGka7QG9vKw5MOpiL5wD3uehM9XEq4bVa6A=; b=g+CCjOVVVadAKP+qBh3WXxzrvxH6X8POobehglZF87K0Oz0LfECOWvRdiXq2kQLCz05Uq7 8fGBN2ogOhxp9vwMFT2h4m6qI6a87JbM8kaCnDiwaKd+bDybR6Y5zjiQ2LNNZ5MLwmhgQR w3vhRwydUpXQHpGglFyqH+F6WbL7HhBkHePbsGIYiGsaemzNeZXo/aXgFaagee0eUyMp7/ lHu6HVQyRS7KoBaI7ZH+vaEvuaCPXH06ubembXpSOlDWVmem8Ftt7HAm7jaElJIDibcmSM m23hzxiTrGfD4ovzOZNQYnfFix3SeqMch5Vh8XrZxHpS5VmoBUBLABDALp4U4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730696304; a=rsa-sha256; cv=none; b=Efp4v9JfuaHvhwkiFWjpi04RsWb74404mfOFrl4swW7kVzuAQXKzAi8qSXJXFU69rkHJ8e mFKhJ4mYo+Skz6Zxh0b9GaRoIYv2SX5T9+SLEyDFmNepVrq/zg+ZDPUv3kmeoVLX9Nc3FP BsFxxwBNV6ToINQM+ownkejiuINHQk1fHmfI2dw+3LHnDrySYLCZBUOhaToO/4+V3NSL/4 VIpEmOwvk6KIGt3f3NIBsYsFHFLd2twB69tviEs2uJsky6mhMqTJj4vV0GEV2kiozNHZcW KkxqGziWMg/h717DHRlShlLu6nzGP/ncLx8P9aWV8XXgjCJ9Gom8vY++TSsxzw== 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 4XhfPD3cWczKR2; Mon, 4 Nov 2024 04:58:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A44wOPU049268; Mon, 4 Nov 2024 04:58:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A44wOFk049265; Mon, 4 Nov 2024 04:58:24 GMT (envelope-from git) Date: Mon, 4 Nov 2024 04:58:24 GMT Message-Id: <202411040458.4A44wOFk049265@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: adce5eaab9a9 - stable/14 - loader.efi: Fix LOADER_NET_SUPPORT=no builds 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: adce5eaab9a975655cd846c9841551ed8f89207a Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=adce5eaab9a975655cd846c9841551ed8f89207a commit adce5eaab9a975655cd846c9841551ed8f89207a Author: Tatiana AuthorDate: 2024-11-02 22:13:58 +0000 Commit: Warner Losh CommitDate: 2024-11-04 00:51:25 +0000 loader.efi: Fix LOADER_NET_SUPPORT=no builds We include too many references to networking things in the non-networking build for loader.efi. Ifdef out netserver command when we are disabling network support to resolve. PR: 277528 MFC After: 2 days Reviewed by: imp (cherry picked from commit 47ef2a131091508e049ab10cad7f91a3c1342cd9) --- stand/efi/loader/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index 324150f7c8c7..61bfe7a4d673 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -1755,6 +1755,7 @@ command_chain(int argc, char *argv[]) COMMAND_SET(chain, "chain", "chain load file", command_chain); +#if defined(LOADER_NET_SUPPORT) extern struct in_addr servip; static int command_netserver(int argc, char *argv[]) @@ -1785,3 +1786,4 @@ command_netserver(int argc, char *argv[]) COMMAND_SET(netserver, "netserver", "change or display netserver URI", command_netserver); +#endif