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 47C8674003C for ; Thu, 25 Jan 2024 16:56:51 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=uUGsy927aOZHK1AQPJfaUFKyeq4Jp1mrDrfeX+UQqhQ=; 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=1706201809; v=1; b=LMLMz0kqVDXG5vWu70pZu3WrZVNCVCm5KxfDMkDUtZHu8VyyewmfKJd5MymPxOV/73peNenm ZSlqD9GhTcVryVRnRTFjW3MtLJAkJoSh/2x59ZAc0d+4uSRSv6OtOnFx/6BF96/+lEQGSVVRckA +DQZU2Qw5Xc4MB3eDZiW5YLI= X-Received: by 127.0.0.2 with SMTP id B0BZYY7687511xboiaFdIs1K; Thu, 25 Jan 2024 08:56:49 -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.23489.1706201809098319233 for ; Thu, 25 Jan 2024 08:56:49 -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-244-MInYp4J7PeWyzKl3E3YInQ-1; Thu, 25 Jan 2024 11:56:43 -0500 X-MC-Unique: MInYp4J7PeWyzKl3E3YInQ-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 9AAD783D42D; Thu, 25 Jan 2024 16:56:42 +0000 (UTC) X-Received: from [10.39.195.100] (unknown [10.39.195.100]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2B45351D5; Thu, 25 Jan 2024 16:56:41 +0000 (UTC) Message-ID: <4c69bd3d-685e-74fc-eff3-d407ae942a8d@redhat.com> Date: Thu, 25 Jan 2024 17:56:40 +0100 MIME-Version: 1.0 Subject: Re: [edk2-devel] [PATCH 06/11] OvmfPkg: switch OvmfPkgIa32 to new shell include files To: devel@edk2.groups.io, kraxel@redhat.com Cc: Jiewen Yao , Ard Biesheuvel , Michael Roth , Erdem Aktas , Min Xu , Tom Lendacky , Oliver Steffen References: <20240124163802.2160303-1-kraxel@redhat.com> <20240124163802.2160303-7-kraxel@redhat.com> From: "Laszlo Ersek" In-Reply-To: <20240124163802.2160303-7-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: Ek3vuzaEEzpmE95Nuwoem3Pix7686176AA= 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=LMLMz0kq; 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 1/24/24 17:37, Gerd Hoffmann wrote: > Signed-off-by: Gerd Hoffmann > --- > OvmfPkg/OvmfPkgIa32.dsc | 49 ++--------------------------------------- > OvmfPkg/OvmfPkgIa32.fdf | 11 ++------- > 2 files changed, 4 insertions(+), 56 deletions(-) >=20 > diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc > index 28379961a78e..23f949fd9845 100644 > --- a/OvmfPkg/OvmfPkgIa32.dsc > +++ b/OvmfPkg/OvmfPkgIa32.dsc > @@ -237,16 +237,12 @@ [LibraryClasses] > TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf > !endif > =20 > -!if $(BUILD_SHELL) =3D=3D TRUE > - ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf > -!endif > - ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.= inf > - > S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScr= iptLib.inf > SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf > OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeL= ib/BaseOrderedCollectionRedBlackTreeLib.inf > =20 > !include OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc > +!include OvmfPkg/Include/Dsc/ShellLibs.dsc.inc > =20 > [LibraryClasses.common] > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf > @@ -874,48 +870,7 @@ [Components] > MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf > MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf > =20 > -!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" && $(BUILD_SHELL) =3D=3D TRUE > - ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { > - > - gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > - } > - ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf { > - > - gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > - } > - ShellPkg/DynamicCommand/VariablePolicyDynamicCommand/VariablePolicyDyn= amicCommand.inf { > - > - gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > - } > - OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.= inf { > - > - gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > - } > -!endif > -!if $(BUILD_SHELL) =3D=3D TRUE > - ShellPkg/Application/Shell/Shell.inf { > - > - ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellComm= andLib.inf > - NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Co= mmandsLib.inf > - NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1Co= mmandsLib.inf > - NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3Co= mmandsLib.inf > - NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1= CommandsLib.inf > - NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Co= mmandsLib.inf > - NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstal= l1CommandsLib.inf > - NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwor= k1CommandsLib.inf > -!if $(NETWORK_IP6_ENABLE) =3D=3D TRUE > - NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwor= k2CommandsLib.inf > -!endif > - HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleP= arsingLib.inf > - PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf > - BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellB= cfgCommandLib.inf > - > - > - gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF > - gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > - gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000 > - } > -!endif > +!include OvmfPkg/Include/Dsc/ShellComponents.dsc.inc > =20 > !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE > SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfig= Dxe.inf > diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf > index 501b4de4695e..6c56c5e53f21 100644 > --- a/OvmfPkg/OvmfPkgIa32.fdf > +++ b/OvmfPkg/OvmfPkgIa32.fdf > @@ -293,15 +293,6 @@ [FV.DXEFV] > INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf > INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf > =20 > -!if $(BUILD_SHELL) =3D=3D TRUE && $(TOOL_CHAIN_TAG) !=3D "XCODE5" > -INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf > -INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf > -INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellComma= nd.inf > -!endif > -!if $(BUILD_SHELL) =3D=3D TRUE > -INF ShellPkg/Application/Shell/Shell.inf > -!endif > - > INF MdeModulePkg/Logo/LogoDxe.inf > =20 > # > @@ -361,6 +352,8 @@ [FV.DXEFV] > # > !include OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc > =20 > +!include OvmfPkg/Include/Fdf/ShellDxe.fdf.inc > + > !if $(LOAD_X64_ON_IA32_ENABLE) =3D=3D TRUE > INF OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.inf > !endif Note that this patch is inconsistent with patch#2 (OvmfPkg: add ShellLibs.dsc.inc); in that patch, "OvmfPkgX64.dsc" gets a module-scope ShellCEntryLib class resolution for "EnrollDefaultKeys.inf", but here, "OvmfPkgIa32.dsc". *However*, that inconsistency is actually good (for this patch), because -- as I argue under patch#2 -- EnrollDefaultKeys.inf should be left alone. 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 (#114432): https://edk2.groups.io/g/devel/message/114432 Mute This Topic: https://groups.io/mt/103935349/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/12367111/7686176/19134562= 12/xyzzy [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-