From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id EC8EBD811AF for ; Thu, 15 Feb 2024 10:25:14 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=5vpTnN63ad5H1rrtheqFxr0kWaUaMQhZXTd9e7gb5ek=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1707992713; v=1; b=SgFCXXLwWD5vwqiROWj3+UHsg+GgFsjJCqqnFZEAH+UCxUKn1byjcei2Wl04VoTUwLwl2AiW sZ6fd7spMKFaW+SvSaArQ3HEbZ61bJzINQ1Jy0fU1oyfSxRQGprDnZvYCIvyRjEeqeHxFy9NLVP hV3PAjOE6dj0wPYHvTZ6rVvA= X-Received: by 127.0.0.2 with SMTP id aXgRYY7687511x579iCjgBPD; Thu, 15 Feb 2024 02:25:13 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web11.11127.1707992713047068390 for ; Thu, 15 Feb 2024 02:25:13 -0800 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-531-v5ij9p9fMMGIKtnwY3uvUA-1; Thu, 15 Feb 2024 05:25:08 -0500 X-MC-Unique: v5ij9p9fMMGIKtnwY3uvUA-1 X-Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 38F1B185A784; Thu, 15 Feb 2024 10:25:08 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.193.16]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D015E2166B32; Thu, 15 Feb 2024 10:25:07 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 306F71800DFB; Thu, 15 Feb 2024 11:25:03 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Jiewen Yao , Gerd Hoffmann , Laszlo Ersek , Min Xu , Tom Lendacky , Oliver Steffen , Erdem Aktas , Ard Biesheuvel , Michael Roth Subject: [edk2-devel] [PATCH v2 04/12] OvmfPkg: Shell*.inc: allow building without network support Date: Thu, 15 Feb 2024 11:24:55 +0100 Message-ID: <20240215102503.273275-5-kraxel@redhat.com> In-Reply-To: <20240215102503.273275-1-kraxel@redhat.com> References: <20240215102503.273275-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,kraxel@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: OIOWXVgumfAVG6ZQvJQ6VVs4x7686176AA= Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=SgFCXXLw; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=redhat.com (policy=none) Add NETWORK_ENABLE conditionals for the components which need network support. Signed-off-by: Gerd Hoffmann --- OvmfPkg/Include/Dsc/ShellComponents.dsc.inc | 6 ++++++ OvmfPkg/Include/Fdf/ShellDxe.fdf.inc | 2 ++ 2 files changed, 8 insertions(+) diff --git a/OvmfPkg/Include/Dsc/ShellComponents.dsc.inc b/OvmfPkg/Include/Dsc/ShellComponents.dsc.inc index 1a3a349a9de5..4075688e416d 100644 --- a/OvmfPkg/Include/Dsc/ShellComponents.dsc.inc +++ b/OvmfPkg/Include/Dsc/ShellComponents.dsc.inc @@ -5,6 +5,7 @@ !if $(BUILD_SHELL) == TRUE !if $(TOOL_CHAIN_TAG) != "XCODE5" +!if $(NETWORK_ENABLE) == TRUE ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE @@ -13,6 +14,7 @@ gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE } +!endif ShellPkg/DynamicCommand/VariablePolicyDynamicCommand/VariablePolicyDynamicCommand.inf { gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE @@ -32,9 +34,13 @@ NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf +!if $(NETWORK_ENABLE) == TRUE +!if $(NETWORK_IP4_ENABLE) == TRUE NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf +!endif !if $(NETWORK_IP6_ENABLE) == TRUE NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf +!endif !endif HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf diff --git a/OvmfPkg/Include/Fdf/ShellDxe.fdf.inc b/OvmfPkg/Include/Fdf/ShellDxe.fdf.inc index 0935f06fa368..6536c30c5413 100644 --- a/OvmfPkg/Include/Fdf/ShellDxe.fdf.inc +++ b/OvmfPkg/Include/Fdf/ShellDxe.fdf.inc @@ -5,8 +5,10 @@ !if $(BUILD_SHELL) == TRUE !if $(TOOL_CHAIN_TAG) != "XCODE5" +!if $(NETWORK_ENABLE) == TRUE INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf +!endif INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf !endif -- 2.43.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#115508): https://edk2.groups.io/g/devel/message/115508 Mute This Topic: https://groups.io/mt/104370207/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-