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 32329D81164 for ; Thu, 25 Jan 2024 13:22:05 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=HbHLed+fkGh23KdhxgRbfyvR+ADf8fqCjgxcJ3h3/w4=; 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=1706188924; v=1; b=MMCQuj83QtVgPgJ1Dg8+tLKDjRm+ki8X224Ge2rqjCTRvOFBvgYfMX+F4Q5cZ28AuHhNY5p8 F1qmt30h28ZcXfC/cgvh6TK7CqR+T2GjA55WCuUptuEqxXOD3wKB7IMvPuSzFdk54oFJV/kYcLK H3Nyj/mUNOYy+GP9Kl2pqRcM= X-Received: by 127.0.0.2 with SMTP id Dt4LYY7687511xWqGZxQCumR; Thu, 25 Jan 2024 05:22:04 -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.17339.1706188924011079331 for ; Thu, 25 Jan 2024 05:22:04 -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-350-z4L3YYBPOmSzMcA-57NEsw-1; Thu, 25 Jan 2024 08:22:01 -0500 X-MC-Unique: z4L3YYBPOmSzMcA-57NEsw-1 X-Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (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 C837985A58A; Thu, 25 Jan 2024 13:22:00 +0000 (UTC) X-Received: from [10.39.195.100] (unknown [10.39.195.100]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6FA2E40C9444; Thu, 25 Jan 2024 13:21:59 +0000 (UTC) Message-ID: <67db6beb-d6cc-c621-e0d4-fa1e7b1f31ab@redhat.com> Date: Thu, 25 Jan 2024 14:21:58 +0100 MIME-Version: 1.0 Subject: Re: [edk2-devel] [PATCH 03/11] OvmfPkg: add ShellDxe.fdf.inc 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-4-kraxel@redhat.com> From: "Laszlo Ersek" In-Reply-To: <20240124163802.2160303-4-kraxel@redhat.com> X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 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: aykzHXcmb3PqjuzVBpAVe5Hbx7686176AA= 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=MMCQuj83; 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:37, Gerd Hoffmann wrote: > Move EFI Shell firmware volume files to > the new ShellDxe.fdf.inc file. >=20 > Signed-off-by: Gerd Hoffmann > --- > OvmfPkg/OvmfPkgX64.fdf | 11 ++--------- > OvmfPkg/Include/Fdf/ShellDxe.fdf.inc | 14 ++++++++++++++ > 2 files changed, 16 insertions(+), 9 deletions(-) > create mode 100644 OvmfPkg/Include/Fdf/ShellDxe.fdf.inc (1) I think that the filename "ShellDxe.fdf.inc" (also seen in the subject) is a misnomer. The affected binaries are not all DXE drivers, the shell itself is a UEFI application. The naming probably alludes to these modules being included in [FV.DXEFV]. Therefore "ShellDxeFv.fdf.inc" would be more correct. (And indeed that applies to existent files too: OvmfTpmDxe should be OvmfTpmDxeFv, OvmfTpmPei should be OvmfTpmPeiFv.) For consistency, adding the Fv part to just this new file name, is not good, of course. So if you don't feel like renaming the existing FDF include files, then ignore this point. >=20 > diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf > index f47ab1727e4c..eb3fb90cb8b6 100644 > --- a/OvmfPkg/OvmfPkgX64.fdf > +++ b/OvmfPkg/OvmfPkgX64.fdf > @@ -319,15 +319,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 > INF OvmfPkg/TdxDxe/TdxDxe.inf > @@ -402,6 +393,8 @@ [FV.DXEFV] > # > !include OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc > =20 > +!include OvmfPkg/Include/Fdf/ShellDxe.fdf.inc > + > ########################################################################= ######## > =20 > [FV.FVMAIN_COMPACT] > diff --git a/OvmfPkg/Include/Fdf/ShellDxe.fdf.inc b/OvmfPkg/Include/Fdf/S= hellDxe.fdf.inc > new file mode 100644 > index 000000000000..0935f06fa368 > --- /dev/null > +++ b/OvmfPkg/Include/Fdf/ShellDxe.fdf.inc > @@ -0,0 +1,14 @@ > +## > +# SPDX-License-Identifier: BSD-2-Clause-Patent > +## > + > +!if $(BUILD_SHELL) =3D=3D TRUE > + > +!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 > +!endif ... and this indeed shows, in comparison to patch#1, that VariablePolicyDynamicCommand is only built, but not included in the firmware volume / flash device. With (1) fixed or not: 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 (#114403): https://edk2.groups.io/g/devel/message/114403 Mute This Topic: https://groups.io/mt/103935342/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-