On May 25, 2020, at 12:31 PM, Laszlo Ersek <lersek@redhat.com> wrote:

Hi Andrew,

On 05/24/20 23:20, Andrew Fish via groups.io wrote:
With this BZ getting fixed we no longer need to special case XCODE.

Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=557
Signed-off-by: Andrew Fish <afish@apple.com>

Signed-off-by: Andrew Fish <afish@apple.com>
---
OvmfPkg/OvmfPkgIa32.dsc    | 3 +--
OvmfPkg/OvmfPkgIa32.fdf    | 2 --
OvmfPkg/OvmfPkgIa32X64.dsc | 4 ++--
OvmfPkg/OvmfPkgIa32X64.fdf | 2 --
OvmfPkg/OvmfPkgX64.dsc     | 3 +--
OvmfPkg/OvmfPkgX64.fdf     | 2 --
OvmfPkg/OvmfXen.dsc        | 3 +--
OvmfPkg/OvmfXen.fdf        | 2 --
8 files changed, 5 insertions(+), 16 deletions(-)


Laszlo,

Thanks for the feedback. 

Can I ask that you go to https://www.tianocore.org, click on How to Contribute and point me at the chain of links I did not follow, if I missed it tit is likely due to too many links and too much information being vended. When people are starting out we should vend them the instructions that work and let them opt in to learning more. 

(1) Please run "BaseTools/Scripts/SetupGit.py" in your edk2 clone,
because right now, the patch is formatted/posted with too many CR
characters.


I filed https://bugzilla.tianocore.org/show_bug.cgi?id=2767 since I passed PatchCheck.py but did not run  BaseTools/Scripts/SetupGit.py

Thanks,

Andrew Fish

(2) I'm not on the CC list -- is that an oversight, or should I have
received the message directly due to some other means? (I've only found
this message in my list folder).

(3) As the diffstat above indicates it too, the
"OvmfPkg/OvmfPkgIa32X64.dsc" update is inconsistent with the other DSC
file updates, namely in whitespace.

In the other DSC files, only one newline is inserted (just before
Shell.inf), but in "OvmfPkgIa32X64.dsc", two newlines are inserted. One
before Shell.inf, and another before "TftpDynamicCommand.inf".

(4) There's a typo in the subject line of this patch; please replace
"OvmfwPkg" with "OvmfPkg".

Thank you!
Laszlo

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index d0df9cbbfb2b..8166d1588ae5 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -878,7 +878,6 @@ [Components]
  OvmfPkg/Csm/Csm16/Csm16.inf

!endif



-!if $(TOOL_CHAIN_TAG) != "XCODE5"

  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {

    <PcdsFixedAtBuild>

      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

@@ -887,7 +886,7 @@ [Components]
    <PcdsFixedAtBuild>

      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

  }

-!endif

+

  ShellPkg/Application/Shell/Shell.inf {

    <LibraryClasses>

      ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf

diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
index e2b759aa8d05..cb1a8b1eba60 100644
--- a/OvmfPkg/OvmfPkgIa32.fdf
+++ b/OvmfPkg/OvmfPkgIa32.fdf
@@ -288,10 +288,8 @@ [FV.DXEFV]
INF  FatPkg/EnhancedFatDxe/Fat.inf

INF  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf



-!if $(TOOL_CHAIN_TAG) != "XCODE5"

INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf

INF  OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf

-!endif

INF  ShellPkg/Application/Shell/Shell.inf



INF MdeModulePkg/Logo/LogoDxe.inf

diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index b3ae62fee92b..e60d25db575e 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -892,7 +892,7 @@ [Components.X64]
  OvmfPkg/Csm/Csm16/Csm16.inf

!endif



-!if $(TOOL_CHAIN_TAG) != "XCODE5"

+

  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {

    <PcdsFixedAtBuild>

      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

@@ -901,7 +901,7 @@ [Components.X64]
    <PcdsFixedAtBuild>

      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

  }

-!endif

+

  ShellPkg/Application/Shell/Shell.inf {

    <LibraryClasses>

      ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf

diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index bfca1eff9e83..4cd4dd652a9f 100644
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -289,10 +289,8 @@ [FV.DXEFV]
INF  FatPkg/EnhancedFatDxe/Fat.inf

INF  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf



-!if $(TOOL_CHAIN_TAG) != "XCODE5"

INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf

INF  OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf

-!endif

INF  ShellPkg/Application/Shell/Shell.inf



INF MdeModulePkg/Logo/LogoDxe.inf

diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index f7fe75ebf531..3b46bce5a6e0 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -888,7 +888,6 @@ [Components]
  OvmfPkg/Csm/Csm16/Csm16.inf

!endif



-!if $(TOOL_CHAIN_TAG) != "XCODE5"

  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {

    <PcdsFixedAtBuild>

      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

@@ -897,7 +896,7 @@ [Components]
    <PcdsFixedAtBuild>

      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

  }

-!endif

+

  ShellPkg/Application/Shell/Shell.inf {

    <LibraryClasses>

      ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf

diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index bfca1eff9e83..4cd4dd652a9f 100644
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -289,10 +289,8 @@ [FV.DXEFV]
INF  FatPkg/EnhancedFatDxe/Fat.inf

INF  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf



-!if $(TOOL_CHAIN_TAG) != "XCODE5"

INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf

INF  OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf

-!endif

INF  ShellPkg/Application/Shell/Shell.inf



INF MdeModulePkg/Logo/LogoDxe.inf

diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc
index 3af0ee705407..0c11d4732628 100644
--- a/OvmfPkg/OvmfXen.dsc
+++ b/OvmfPkg/OvmfXen.dsc
@@ -670,7 +670,6 @@ [Components]
  OvmfPkg/Csm/Csm16/Csm16.inf

!endif



-!if $(TOOL_CHAIN_TAG) != "XCODE5"

  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {

    <PcdsFixedAtBuild>

      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

@@ -679,7 +678,7 @@ [Components]
    <PcdsFixedAtBuild>

      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

  }

-!endif

+

  ShellPkg/Application/Shell/Shell.inf {

    <LibraryClasses>

      ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf

diff --git a/OvmfPkg/OvmfXen.fdf b/OvmfPkg/OvmfXen.fdf
index d9ee14b484a0..e81689292313 100644
--- a/OvmfPkg/OvmfXen.fdf
+++ b/OvmfPkg/OvmfXen.fdf
@@ -361,10 +361,8 @@ [FV.DXEFV]
INF  FatPkg/EnhancedFatDxe/Fat.inf

INF  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf



-!if $(TOOL_CHAIN_TAG) != "XCODE5"

INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf

INF  OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf

-!endif

INF  ShellPkg/Application/Shell/Shell.inf



INF MdeModulePkg/Logo/LogoDxe.inf