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 DFFADD811C5 for ; Thu, 25 Jan 2024 17:06:01 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=YIZTWTJEp3bRkGJBPAF0n6LIOP6OHD91ZOdKGQ6Pa10=; 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=1706202360; v=1; b=wMPq0cHkZM+6rhGb1fNFy1ZJ1LB/ifje1+zJg9gD3s+yTf2pHMpjcxYOjEG46QnJ8r/Gmwp2 W3jM31eapw3nfyYBvOLxwwPsGQyNDYZ1/8Fsv6QALao6886WEG6/vCuV+Kbmch3HTayElwYkaT4 TYsm5AP1MkbEubqTBCmlfd9Y= X-Received: by 127.0.0.2 with SMTP id oXKbYY7687511xLdEHJYPKmc; Thu, 25 Jan 2024 09:06:00 -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.23782.1706202359969195412 for ; Thu, 25 Jan 2024 09:06:00 -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-245-J8-7QxDMNWyKU_XLEottvA-1; Thu, 25 Jan 2024 12:05:55 -0500 X-MC-Unique: J8-7QxDMNWyKU_XLEottvA-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 8343287DC02; Thu, 25 Jan 2024 17:05:54 +0000 (UTC) X-Received: from [10.39.195.100] (unknown [10.39.195.100]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1332A51D5; Thu, 25 Jan 2024 17:05:52 +0000 (UTC) Message-ID: Date: Thu, 25 Jan 2024 18:05:52 +0100 MIME-Version: 1.0 Subject: Re: [edk2-devel] [PATCH 10/11] OvmfPkg: switch MicrovmX64 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-11-kraxel@redhat.com> From: "Laszlo Ersek" In-Reply-To: <20240124163802.2160303-11-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: 4ucdo8oprt0s5TopK7KqMxQhx7686176AA= 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=wMPq0cHk; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=redhat.com (policy=none) On 1/24/24 17:38, Gerd Hoffmann wrote: > Signed-off-by: Gerd Hoffmann > --- > OvmfPkg/Microvm/MicrovmX64.dsc | 55 ++++++++-------------------------- > OvmfPkg/Microvm/MicrovmX64.fdf | 9 ++---- > 2 files changed, 14 insertions(+), 50 deletions(-) >=20 > diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.= dsc > index 063324cd0572..2f2b95c9f0fa 100644 > --- a/OvmfPkg/Microvm/MicrovmX64.dsc > +++ b/OvmfPkg/Microvm/MicrovmX64.dsc > @@ -33,6 +33,11 @@ [Defines] > DEFINE SMM_REQUIRE =3D FALSE > DEFINE SOURCE_DEBUG_ENABLE =3D FALSE > =20 > + # > + # Shell can be useful for debugging but should not be enabled for prod= uction > + # > + DEFINE BUILD_SHELL =3D TRUE > + > # > # Network definition > # > @@ -230,8 +235,6 @@ [LibraryClasses] > TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf > !endif > =20 > - ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf > - 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 > @@ -239,6 +242,8 @@ [LibraryClasses] > Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibNull/Dx= eTcg2PhysicalPresenceLib.inf > TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasur= ementLibNull.inf > =20 > +!include OvmfPkg/Include/Dsc/ShellLibs.dsc.inc > + > [LibraryClasses.common] > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf > CcExitLib|OvmfPkg/Library/CcExitLib/CcExitLib.inf > @@ -837,50 +842,14 @@ [Components] > MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf > MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf > =20 > -!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" > - 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 > - 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 > - } > +!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 { > + > + ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLi= b.inf > + } > !endif > =20 > OvmfPkg/PlatformDxe/Platform.inf "OvmfPkg/EnrollDefaultKeys/EnrollDefaultKeys.inf" should be left alone. Acked-by: Laszlo Ersek > diff --git a/OvmfPkg/Microvm/MicrovmX64.fdf b/OvmfPkg/Microvm/MicrovmX64.= fdf > index c877b3f088f9..825bf9f5e41f 100644 > --- a/OvmfPkg/Microvm/MicrovmX64.fdf > +++ b/OvmfPkg/Microvm/MicrovmX64.fdf > @@ -257,13 +257,6 @@ [FV.DXEFV] > INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf > INF OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf > =20 > -!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" > -INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf > -INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf > -INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellComma= nd.inf > -!endif > -INF ShellPkg/Application/Shell/Shell.inf > - > INF MdeModulePkg/Logo/LogoDxe.inf > =20 > # > @@ -302,6 +295,8 @@ [FV.DXEFV] > INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.= inf > INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf > =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 (#114436): https://edk2.groups.io/g/devel/message/114436 Mute This Topic: https://groups.io/mt/103935354/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-