From: Laszlo Ersek <lersek@redhat.com>
To: Shenglei Zhang <shenglei.zhang@intel.com>, edk2-devel@lists.01.org
Cc: Jordan Justen <jordan.l.justen@intel.com>
Subject: Re: [PATCH v3 4/5] OvmfPkg: Remove EdkShellBinPkg in FDF
Date: Mon, 5 Nov 2018 22:50:35 +0100 [thread overview]
Message-ID: <b9477966-1507-9e11-71fb-4f906a4c7327@redhat.com> (raw)
In-Reply-To: <20181105030807.27420-5-shenglei.zhang@intel.com>
On 11/05/18 04:08, Shenglei Zhang wrote:
> From: shenglei <shenglei.zhang@intel.com>
>
> Remove EdkShellBinPkg in OvmfPkgIa32.fdf,
> OvmfPkg/OvmfPkgIa32X64.fdf amd OvmfPkg/OvmfPkgX64.fdf.
> https://bugzilla.tianocore.org/show_bug.cgi?id=1108
>
> v2: Remove USE_OLD_SHELL in DSC because it will be
> unnecessary to use it.
>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Change-Id: I4db7068a3a1f68a1f6303079b73dc548c9feb2e3
(1) Please remove the Change-Id line from the commit message.
(2) In order to be consistent with the other subject lines in the patch
set, I suggest updating "FDF" to "FDF and DSC". (See the Nt32Pkg patch
in particular.)
IMO these can be implemented right before pushing the patch.
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Hmm... OK, I see Jordan's R-b is coming from
<https://lists.01.org/pipermail/edk2-devel/2018-November/031736.html>.
Thank you Jordan! (And it seems like the S-o-b has been fixed indeed.)
With (1) and (2) addressed:
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Thanks
Laszlo
> ---
> OvmfPkg/OvmfPkgIa32.dsc | 4 ----
> OvmfPkg/OvmfPkgIa32.fdf | 4 ----
> OvmfPkg/OvmfPkgIa32X64.dsc | 4 ----
> OvmfPkg/OvmfPkgIa32X64.fdf | 4 ----
> OvmfPkg/OvmfPkgX64.dsc | 4 ----
> OvmfPkg/OvmfPkgX64.fdf | 4 ----
> 6 files changed, 24 deletions(-)
>
> diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
> index 9f07e75050..617e51350f 100644
> --- a/OvmfPkg/OvmfPkgIa32.dsc
> +++ b/OvmfPkg/OvmfPkgIa32.dsc
> @@ -510,9 +510,7 @@
> gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE
> !endif
>
> -!ifndef $(USE_OLD_SHELL)
> gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }
> -!endif
>
> !if $(SMM_REQUIRE) == TRUE
> gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000
> @@ -837,7 +835,6 @@
> OvmfPkg/Csm/Csm16/Csm16.inf
> !endif
>
> -!ifndef $(USE_OLD_SHELL)
> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
> <PcdsFixedAtBuild>
> gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> @@ -864,7 +861,6 @@
> gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000
> }
> -!endif
>
> !if $(SECURE_BOOT_ENABLE) == TRUE
> SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
> diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
> index 52b8b1fea1..1646281299 100644
> --- a/OvmfPkg/OvmfPkgIa32.fdf
> +++ b/OvmfPkg/OvmfPkgIa32.fdf
> @@ -288,12 +288,8 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
> INF FatPkg/EnhancedFatDxe/Fat.inf
> INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
>
> -!ifndef $(USE_OLD_SHELL)
> INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
> INF ShellPkg/Application/Shell/Shell.inf
> -!else
> -INF RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf
> -!endif
>
> INF MdeModulePkg/Logo/LogoDxe.inf
>
> diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
> index a4eaeb808c..7e2c71d4e6 100644
> --- a/OvmfPkg/OvmfPkgIa32X64.dsc
> +++ b/OvmfPkg/OvmfPkgIa32X64.dsc
> @@ -516,9 +516,7 @@
> gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE
> !endif
>
> -!ifndef $(USE_OLD_SHELL)
> gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }
> -!endif
>
> !if $(SMM_REQUIRE) == TRUE
> gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000
> @@ -846,7 +844,6 @@
> OvmfPkg/Csm/Csm16/Csm16.inf
> !endif
>
> -!ifndef $(USE_OLD_SHELL)
> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
> <PcdsFixedAtBuild>
> gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> @@ -873,7 +870,6 @@
> gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000
> }
> -!endif
>
> !if $(SECURE_BOOT_ENABLE) == TRUE
> SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
> diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
> index 70845d6972..2a5663abcb 100644
> --- a/OvmfPkg/OvmfPkgIa32X64.fdf
> +++ b/OvmfPkg/OvmfPkgIa32X64.fdf
> @@ -289,12 +289,8 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
> INF FatPkg/EnhancedFatDxe/Fat.inf
> INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
>
> -!ifndef $(USE_OLD_SHELL)
> INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
> INF ShellPkg/Application/Shell/Shell.inf
> -!else
> -INF RuleOverride = BINARY USE = X64 EdkShellBinPkg/FullShell/FullShell.inf
> -!endif
>
> INF MdeModulePkg/Logo/LogoDxe.inf
>
> diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
> index aa3efc5e73..2fcd293235 100644
> --- a/OvmfPkg/OvmfPkgX64.dsc
> +++ b/OvmfPkg/OvmfPkgX64.dsc
> @@ -515,9 +515,7 @@
> gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE
> !endif
>
> -!ifndef $(USE_OLD_SHELL)
> gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }
> -!endif
>
> !if $(SMM_REQUIRE) == TRUE
> gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000
> @@ -844,7 +842,6 @@
> OvmfPkg/Csm/Csm16/Csm16.inf
> !endif
>
> -!ifndef $(USE_OLD_SHELL)
> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
> <PcdsFixedAtBuild>
> gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> @@ -871,7 +868,6 @@
> gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000
> }
> -!endif
>
> !if $(SECURE_BOOT_ENABLE) == TRUE
> SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
> diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
> index 1eb46ac9a2..2a5663abcb 100644
> --- a/OvmfPkg/OvmfPkgX64.fdf
> +++ b/OvmfPkg/OvmfPkgX64.fdf
> @@ -289,12 +289,8 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
> INF FatPkg/EnhancedFatDxe/Fat.inf
> INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
>
> -!ifndef $(USE_OLD_SHELL)
> INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
> INF ShellPkg/Application/Shell/Shell.inf
> -!else
> -INF RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf
> -!endif
>
> INF MdeModulePkg/Logo/LogoDxe.inf
>
>
next prev parent reply other threads:[~2018-11-05 21:50 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-05 3:08 [PATCH v3 0/5] Remove EdkShellBinPkg in FDF, DSC and DEC Shenglei Zhang
2018-11-05 3:08 ` [PATCH v3 1/5] Nt32Pkg: " Shenglei Zhang
2018-11-05 6:27 ` Ni, Ruiyu
2018-11-05 3:08 ` [PATCH v3 2/5] Vlv2TbltDevicePkg: Remove EdkShellBinPkg with ShellPkg Shenglei Zhang
2018-11-05 3:34 ` Wei, David
2018-11-05 3:08 ` [PATCH v3 3/5] EmulatorPkg: Remove EdkShellBinPkg in FDF and DEC Shenglei Zhang
2018-11-05 6:26 ` Ni, Ruiyu
2018-11-05 3:08 ` [PATCH v3 4/5] OvmfPkg: Remove EdkShellBinPkg in FDF Shenglei Zhang
2018-11-05 21:50 ` Laszlo Ersek [this message]
2018-11-05 21:53 ` Laszlo Ersek
2018-11-05 3:08 ` [PATCH v3 5/5] CorebootPayloadPkg: " Shenglei Zhang
2018-11-05 6:04 ` You, Benjamin
2018-11-05 16:45 ` [PATCH v3 0/5] Remove EdkShellBinPkg in FDF, DSC and DEC Laszlo Ersek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b9477966-1507-9e11-71fb-4f906a4c7327@redhat.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox