From nobody Mon Sep 16 19:02:36 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+114325+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+114325+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1706114293; cv=none; d=zohomail.com; s=zohoarc; b=Ai68IhluFWZsI4JJ5duq2+3fDa54jKMiIOVwP89pJTyOlfrxSydltMHHan5mRo0qHUE66TBByepI0kC7H8brPsSNWXsLEYCaJidK1KmKNfaN0wPftBt41M4NjvnyJW3ajf7MFxnkYwINfCVtWJgdzWQsU2NTbJFNHP0Ee5e02u4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1706114293; 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=lgjGH5DrsQOMVS0KKeoC2PpkEamCDX1QtuJvbwsO0OY=; b=hD5BMaBpQjABZxtyB3IauiOwUB5YpgIm+RGlOyUaHdNNNJgEx6EnLJJXesHFPJjXBijnDdgku3bPwDyc1brBseHh21+jHIJA3KHb7b/0M/xb5D5nrViV/FmsIVcnytGh26TUbxVcRbVWXnM1zCTxLUmkOYGQrkGwWZVUOeu6TCQ= 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+114325+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 1706114293574123.37096415689427; Wed, 24 Jan 2024 08:38:13 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=ICIdmD8kQva1K/vJ2dxuzKwMF98yFPaOeSNKsmetCf0=; 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=1706114293; v=1; b=oL+9qsru5qsOHCch95Wi8JcYzq1fdhT4G9cpDFOQe5MY7MVATNGoy99plQdUb6DzcwsS9CG1 qOi7fYXWRipVnPAhkghs6YpYeoplzh5jk87RTVgIYi0jNp930xlxVcxtyLLpvM+Oovg0nZgWM3T FBcqC/8N3LgvmJl+APGRLWWg= X-Received: by 127.0.0.2 with SMTP id 3TE0YY1788612xJUNBxvru74; Wed, 24 Jan 2024 08:38:13 -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.web10.27612.1706114292653191926 for ; Wed, 24 Jan 2024 08:38:12 -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-518-nmcwII2MNv-4BVab-FzZGA-1; Wed, 24 Jan 2024 11:38:08 -0500 X-MC-Unique: nmcwII2MNv-4BVab-FzZGA-1 X-Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (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 236C03C2A1C3; Wed, 24 Jan 2024 16:38:08 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.193.66]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CEF43492BC9; Wed, 24 Jan 2024 16:38:07 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id C945118017FB; 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 07/11] OvmfPkg: switch OvmfPkgIa32X64 to new shell include files Date: Wed, 24 Jan 2024 17:37:58 +0100 Message-ID: <20240124163802.2160303-8-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.9 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: TkCLfUpOVt6g1XtjultLWrizx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1706114294949100027 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Gerd Hoffmann Reviewed-by: Laszlo Ersek --- OvmfPkg/OvmfPkgIa32X64.dsc | 54 +++++--------------------------------- OvmfPkg/OvmfPkgIa32X64.fdf | 11 ++------ 2 files changed, 8 insertions(+), 57 deletions(-) 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/DxeS3BootScrip= tLib.inf SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib= /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 { - - gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE - } - ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf { - - gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE - } - ShellPkg/DynamicCommand/VariablePolicyDynamicCommand/VariablePolicyDynam= icCommand.inf { - - gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE - } - OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.in= f { - - gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE - } -!endif -!if $(BUILD_SHELL) =3D=3D TRUE - ShellPkg/Application/Shell/Shell.inf { - - ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellComman= dLib.inf - NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Comm= andsLib.inf - NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1Comm= andsLib.inf - NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3Comm= andsLib.inf - NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1Co= mmandsLib.inf - NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comm= andsLib.inf - NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1= CommandsLib.inf - NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1= CommandsLib.inf -!if $(NETWORK_IP6_ENABLE) =3D=3D TRUE - NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2= CommandsLib.inf -!endif - HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandlePar= singLib.inf - PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf - BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcf= gCommandLib.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/SecureBootConfigDx= e.inf - OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf + OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf { + + ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.= inf + } !endif =20 OvmfPkg/PlatformDxe/Platform.inf 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/LinuxInitrdDynamicShellCommand= .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] --=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 (#114325): https://edk2.groups.io/g/devel/message/114325 Mute This Topic: https://groups.io/mt/103935348/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-