From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <bounce+27952+114433+7686176+12367111@groups.io>
Received: from mail02.groups.io (mail02.groups.io [66.175.222.108])
by spool.mail.gandi.net (Postfix) with ESMTPS id CE179AC1A5B
for <rebecca@openfw.io>; Thu, 25 Jan 2024 16:57:48 +0000 (UTC)
DKIM-Signature: a=rsa-sha256; bh=0GHY4kP5FTwWnXTMfSAnct1q/ecEsgTEWDBBo2tK0jc=;
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=1706201867; v=1;
b=PkFzVbW2DwwxgsCRYw3X56ef0VkNSg7ox89jP3QXM2T6ZzF/XY4K3JSq/7CYwGoBLL0txjaF
lldnlEfekqpenBRbkpdmiAbFsl5ZUScbEN8lCwZa7BVDq5y1/el9SjAVlXPC0COeibclBJxVAFd
ofEmA2HestlRU7NRqLNkwww4=
X-Received: by 127.0.0.2 with SMTP id EojgYY7687511xPLT59WShQQ; Thu, 25 Jan 2024 08:57:47 -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.23516.1706201866992359330
for <devel@edk2.groups.io>;
Thu, 25 Jan 2024 08:57:47 -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-267-pr4M7tHhMa24qLBxRgIrjQ-1; Thu, 25 Jan 2024 11:57:42 -0500
X-MC-Unique: pr4M7tHhMa24qLBxRgIrjQ-1
X-Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10])
(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 73E2783D42B;
Thu, 25 Jan 2024 16:57:42 +0000 (UTC)
X-Received: from [10.39.195.100] (unknown [10.39.195.100])
by smtp.corp.redhat.com (Postfix) with ESMTPS id 06BE3492BFA;
Thu, 25 Jan 2024 16:57:40 +0000 (UTC)
Message-ID: <5326353e-fa5c-43c7-f51a-a25e96de0f63@redhat.com>
Date: Thu, 25 Jan 2024 17:57:39 +0100
MIME-Version: 1.0
Subject: Re: [edk2-devel] [PATCH 07/11] OvmfPkg: switch OvmfPkgIa32X64 to new shell include files
To: devel@edk2.groups.io, kraxel@redhat.com
Cc: Jiewen Yao <jiewen.yao@intel.com>,
Ard Biesheuvel <ardb+tianocore@kernel.org>,
Michael Roth <michael.roth@amd.com>, Erdem Aktas <erdemaktas@google.com>,
Min Xu <min.m.xu@intel.com>, Tom Lendacky <thomas.lendacky@amd.com>,
Oliver Steffen <osteffen@redhat.com>
References: <20240124163802.2160303-1-kraxel@redhat.com>
<20240124163802.2160303-8-kraxel@redhat.com>
From: "Laszlo Ersek" <lersek@redhat.com>
In-Reply-To: <20240124163802.2160303-8-kraxel@redhat.com>
X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Precedence: Bulk
List-Subscribe: <mailto:devel+subscribe@edk2.groups.io>
List-Help: <mailto:devel+help@edk2.groups.io>
Sender: devel@edk2.groups.io
List-Id: <devel.edk2.groups.io>
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: <https://edk2.groups.io/g/devel/leave/12367111/7686176/1913456212/plugh>
X-Gm-Message-State: TOJKq7cO9OyYXFELR0SAYPAIx7686176AA=
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=PkFzVbW2;
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 <kraxel@redhat.com>
> ---
> OvmfPkg/OvmfPkgIa32X64.dsc | 54 +++++---------------------------------
> OvmfPkg/OvmfPkgIa32X64.fdf | 11 ++------
> 2 files changed, 8 insertions(+), 57 deletions(-)
>=20
> diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
> index 5e9eee628aea..4d57026bb1ed 100644
> --- a/OvmfPkg/OvmfPkgIa32X64.dsc
> +++ b/OvmfPkg/OvmfPkgIa32X64.dsc
> @@ -242,16 +242,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
> @@ -888,52 +884,14 @@ [Components.X64]
> 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 {
> - <PcdsFixedAtBuild>
> - gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> - }
> - ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf {
> - <PcdsFixedAtBuild>
> - gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> - }
> - ShellPkg/DynamicCommand/VariablePolicyDynamicCommand/VariablePolicyDyn=
amicCommand.inf {
> - <PcdsFixedAtBuild>
> - gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> - }
> - OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.=
inf {
> - <PcdsFixedAtBuild>
> - gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> - }
> -!endif
> -!if $(BUILD_SHELL) =3D=3D TRUE
> - ShellPkg/Application/Shell/Shell.inf {
> - <LibraryClasses>
> - 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
> -
> - <PcdsFixedAtBuild>
> - 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
> - OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf
> + OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf {
> + <LibraryClasses>
> + ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLi=
b.inf
> + }
> !endif
> =20
> OvmfPkg/PlatformDxe/Platform.inf
(1) OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf should not be changed.
With that undone:
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
> diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
> index 74cfb58f06cd..ee8068ad55dc 100644
> --- a/OvmfPkg/OvmfPkgIa32X64.fdf
> +++ b/OvmfPkg/OvmfPkgIa32X64.fdf
> @@ -294,15 +294,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
> #
> @@ -368,6 +359,8 @@ [FV.DXEFV]
> #
> !include OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc
> =20
> +!include OvmfPkg/Include/Fdf/ShellDxe.fdf.inc
> +
> ########################################################################=
########
> =20
> [FV.FVMAIN_COMPACT]
-=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 (#114433): https://edk2.groups.io/g/devel/message/114433
Mute This Topic: https://groups.io/mt/103935348/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-