From nobody Fri Oct 18 05:23:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+114322+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+114322+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1706114291; cv=none; d=zohomail.com; s=zohoarc; b=MaeEeMTwqFNKHzUSV2gu1IK6SdSVpKBsBLM5V0JdyPkUjoCXtMl9BbMNyLc1AEYFj+WL1oTMCfTXXL2tYWwU/+Gv95Zg3RssQeCIyJu4k1ZEWk1YAwsAg8tahviqwmFoxqNCXd8sRF1er/Ro4SOpbvr/NkLAZjkMJ763qm4XuSo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1706114291; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=Z8zJ2lbm7PG6iwImJ+P/U1Pw16oBy+X6/K5FeGeY7Vg=; b=ns4j7GTY9dbIYmhfVhVfSdvIACW4S467vFEZ2VzEhr/c56l07ZeZXXVIhkN9IPxTQVx6jcowHtcgHoynyXKQOiZnvKU7XXJ2iaBYhsTCu/oLJNmDYNN9qfeFGAU4EfwgJGoF/XoLeV7pSo/lfE+GbNBRR1odvmGLtOOHf22GMT0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+114322+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 17061142913711012.469331719837; Wed, 24 Jan 2024 08:38:11 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=8gbqmdtoZteFgkRmVkq/PdvsG0pwTeEQO3PlJoLL96I=; 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=1706114291; v=1; b=aOG2fs3bhPN/E3l5zIh72NC+YE1tAf/QyZFOaSrBeA7UZJxrYo7HxPEvUaiYlAT2JIIkNQDd KeFkAznbd9YFiRE2tZbYscYfE+FzJArVOTEIvHX3ir7LMFkMwQ9n1ud7SQYXAFq1lPVmXCwVoR8 ugMT3oui0JioulUOBBAcfViI= X-Received: by 127.0.0.2 with SMTP id 5wAvYY1788612xfmO53iwumO; Wed, 24 Jan 2024 08:38:11 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web11.27632.1706114290476796599 for ; Wed, 24 Jan 2024 08:38:10 -0800 X-Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-204-Eb7kvKruMQ-qd-0wNZwYaQ-1; Wed, 24 Jan 2024 11:38:07 -0500 X-MC-Unique: Eb7kvKruMQ-qd-0wNZwYaQ-1 X-Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 B5090285F997; Wed, 24 Jan 2024 16:38:06 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.193.66]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7BDBBC37A86; Wed, 24 Jan 2024 16:38:06 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id BD26B1801009; Wed, 24 Jan 2024 17:38:02 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Jiewen Yao , Ard Biesheuvel , Michael Roth , Gerd Hoffmann , Laszlo Ersek , Erdem Aktas , Min Xu , Tom Lendacky , Oliver Steffen Subject: [edk2-devel] [PATCH 04/11] OvmfPkg: Shell*.inc: allow building without network support Date: Wed, 24 Jan 2024 17:37:55 +0100 Message-ID: <20240124163802.2160303-5-kraxel@redhat.com> In-Reply-To: <20240124163802.2160303-1-kraxel@redhat.com> References: <20240124163802.2160303-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 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: zW9UAV9sSqEd7fm5c1YE3TB5x1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1706114292945100016 Content-Type: text/plain; charset="utf-8"; x-default="true" Add NETWORK_ENABLE conditionals for the components which need network support. Signed-off-by: Gerd Hoffmann --- OvmfPkg/Include/Dsc/ShellComponents.dsc.inc | 4 ++++ OvmfPkg/Include/Fdf/ShellDxe.fdf.inc | 2 ++ 2 files changed, 6 insertions(+) diff --git a/OvmfPkg/Include/Dsc/ShellComponents.dsc.inc b/OvmfPkg/Include/= Dsc/ShellComponents.dsc.inc index 1a3a349a9de5..248b4b454b70 100644 --- a/OvmfPkg/Include/Dsc/ShellComponents.dsc.inc +++ b/OvmfPkg/Include/Dsc/ShellComponents.dsc.inc @@ -5,6 +5,7 @@ !if $(BUILD_SHELL) =3D=3D TRUE =20 !if $(TOOL_CHAIN_TAG) !=3D "XCODE5" +!if $(NETWORK_ENABLE) =3D=3D TRUE ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE @@ -13,6 +14,7 @@ gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE } +!endif ShellPkg/DynamicCommand/VariablePolicyDynamicCommand/VariablePolicyDynam= icCommand.inf { gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE @@ -32,7 +34,9 @@ NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1Co= mmandsLib.inf NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comm= andsLib.inf NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1= CommandsLib.inf +!if $(NETWORK_ENABLE) =3D=3D TRUE NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1= CommandsLib.inf +!endif !if $(NETWORK_IP6_ENABLE) =3D=3D TRUE NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2= CommandsLib.inf !endif diff --git a/OvmfPkg/Include/Fdf/ShellDxe.fdf.inc b/OvmfPkg/Include/Fdf/She= llDxe.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) =3D=3D TRUE =20 !if $(TOOL_CHAIN_TAG) !=3D "XCODE5" +!if $(NETWORK_ENABLE) =3D=3D TRUE INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf +!endif INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand= .inf !endif =20 --=20 2.43.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#114322): https://edk2.groups.io/g/devel/message/114322 Mute This Topic: https://groups.io/mt/103935345/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-