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 8DF5278003C for ; Fri, 16 Feb 2024 17:34:29 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=5FSoI0M0tcCNurlfTXMcM5LEAuMch9Jk6AeN+8i7db4=; c=relaxed/simple; d=groups.io; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From:In-Reply-To:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20140610; t=1708104868; v=1; b=WtZhiZ8bssMrjgStLDlpHETz9+IZ1Qu2H7sv2k+GfNG8FWvDHsWanOsKKBMlS+S+DPTWFGSj T3ptXsFrQpGrKFHnoV8Ae0lEn/02Zh+PhJ9wzttqt5tsw/yIBGm4FEC7szkZv6fS4crF6Ubfxtf PqCaHMh+6zHhFAx8NKSLCnSM= X-Received: by 127.0.0.2 with SMTP id EdCAYY7687511xjmtWEfA3mz; Fri, 16 Feb 2024 09:34:28 -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.2971.1708104862208265053 for ; Fri, 16 Feb 2024 09:34:22 -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-662-84QtzKJmPPm8El_qkxnT1Q-1; Fri, 16 Feb 2024 12:34:20 -0500 X-MC-Unique: 84QtzKJmPPm8El_qkxnT1Q-1 X-Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (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 9E26C3814E8E; Fri, 16 Feb 2024 17:34:19 +0000 (UTC) X-Received: from [10.39.194.129] (unknown [10.39.194.129]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0E9DE111F7; Fri, 16 Feb 2024 17:34:16 +0000 (UTC) Message-ID: Date: Fri, 16 Feb 2024 18:34:15 +0100 MIME-Version: 1.0 Subject: Re: [edk2-devel] [PATCH v2 04/12] OvmfPkg: Shell*.inc: allow building without network support To: devel@edk2.groups.io, kraxel@redhat.com Cc: Jiewen Yao , Min Xu , Tom Lendacky , Oliver Steffen , Erdem Aktas , Ard Biesheuvel , Michael Roth References: <20240215102503.273275-1-kraxel@redhat.com> <20240215102503.273275-5-kraxel@redhat.com> From: "Laszlo Ersek" In-Reply-To: <20240215102503.273275-5-kraxel@redhat.com> X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 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,lersek@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: YuT2fMOpendumz9X3j6V856px7686176AA= Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=WtZhiZ8b; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=redhat.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io On 2/15/24 11:24, Gerd Hoffmann wrote: > Add NETWORK_ENABLE conditionals for the components > which need network support. >=20 > Signed-off-by: Gerd Hoffmann > --- > OvmfPkg/Include/Dsc/ShellComponents.dsc.inc | 6 ++++++ > OvmfPkg/Include/Fdf/ShellDxe.fdf.inc | 2 ++ > 2 files changed, 8 insertions(+) >=20 > diff --git a/OvmfPkg/Include/Dsc/ShellComponents.dsc.inc b/OvmfPkg/Includ= e/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) =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/VariablePolicyDyn= amicCommand.inf { > > gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > @@ -32,9 +34,13 @@ > NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1= CommandsLib.inf > NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Co= mmandsLib.inf > NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstal= l1CommandsLib.inf > +!if $(NETWORK_ENABLE) =3D=3D TRUE > +!if $(NETWORK_IP4_ENABLE) =3D=3D TRUE > NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwor= k1CommandsLib.inf > +!endif > !if $(NETWORK_IP6_ENABLE) =3D=3D TRUE > NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwor= k2CommandsLib.inf > +!endif > !endif > HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleP= arsingLib.inf > PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf > diff --git a/OvmfPkg/Include/Fdf/ShellDxe.fdf.inc b/OvmfPkg/Include/Fdf/S= hellDxe.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/LinuxInitrdDynamicShellComma= nd.inf > !endif > =20 Reviewed-by: Laszlo Ersek -=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 (#115547): https://edk2.groups.io/g/devel/message/115547 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] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-