From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from ma1-aaemail-dr-lapp02.apple.com (ma1-aaemail-dr-lapp02.apple.com [17.171.2.68]) by mx.groups.io with SMTP id smtpd.web10.45133.1590466226659855720 for ; Mon, 25 May 2020 21:10:27 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@apple.com header.s=20180706 header.b=RfAb6Y+6; spf=pass (domain: apple.com, ip: 17.171.2.68, mailfrom: afish@apple.com) Received: from pps.filterd (ma1-aaemail-dr-lapp02.apple.com [127.0.0.1]) by ma1-aaemail-dr-lapp02.apple.com (8.16.0.42/8.16.0.42) with SMTP id 04Q4ALls055647; Mon, 25 May 2020 21:10:23 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apple.com; h=from : message-id : content-type : mime-version : subject : date : in-reply-to : cc : to : references; s=20180706; bh=hd+8+yEig4XdoMmsrU2hqnU0zGnizxccRKBxpCFAUjs=; b=RfAb6Y+60FdKOcep3LuTb5ZzC7Y+Fv0MJ7gS2GLdyy0lESwokchDsHW46gmiYPyJ0dgM kb5Myzta4BeI6ipYxvkHR7U+cVvNyXsgzmkQjhnE7fIASpr0Etd21ZxKaOuy5sUE2Cz4 /j7YZeKmObC7Sc+8TUPET1gIAhRL83FejvwtSz2ZI4H+TOlVrbPHnxIkjRCcqNUYOJBZ cFI5yD8V9E2hSo3Jofw8ry+SMOGZ4qhiS5ArYLCQGL88vLPSq3QIRyToyDYFutnaVwwZ OvAj6phRLTg91J1evD9P0ExSOkmX4mRM80+hwcap2BwJBA5KJb0WCxaSV7Eh8H4UAelw +Q== Received: from rn-mailsvcp-mta-lapp02.rno.apple.com (rn-mailsvcp-mta-lapp02.rno.apple.com [10.225.203.150]) by ma1-aaemail-dr-lapp02.apple.com with ESMTP id 3170gsa022-7 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Mon, 25 May 2020 21:10:23 -0700 Received: from rn-mailsvcp-mmp-lapp04.rno.apple.com (rn-mailsvcp-mmp-lapp04.rno.apple.com [17.179.253.17]) by rn-mailsvcp-mta-lapp02.rno.apple.com (Oracle Communications Messaging Server 8.1.0.5.20200312 64bit (built Mar 12 2020)) with ESMTPS id <0QAX00BO37L9F180@rn-mailsvcp-mta-lapp02.rno.apple.com>; Mon, 25 May 2020 21:10:21 -0700 (PDT) Received: from process_milters-daemon.rn-mailsvcp-mmp-lapp04.rno.apple.com by rn-mailsvcp-mmp-lapp04.rno.apple.com (Oracle Communications Messaging Server 8.1.0.5.20200312 64bit (built Mar 12 2020)) id <0QAX00C007G6BY00@rn-mailsvcp-mmp-lapp04.rno.apple.com>; Mon, 25 May 2020 21:10:21 -0700 (PDT) X-Va-A: X-Va-T-CD: e0acb9dc03d22e4581b62f3d752335f3 X-Va-E-CD: 9f326c5a86eba6addfb60893380f57be X-Va-R-CD: 10bbc8ba876c475f86867ff677dae878 X-Va-CD: 0 X-Va-ID: cd01e6ae-5cd9-4758-a9c6-be6a6fb78833 X-V-A: X-V-T-CD: e0acb9dc03d22e4581b62f3d752335f3 X-V-E-CD: 9f326c5a86eba6addfb60893380f57be X-V-R-CD: 10bbc8ba876c475f86867ff677dae878 X-V-CD: 0 X-V-ID: dbf8bfb4-acd5-4e92-bc3e-1725f330916e X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.216,18.0.687 definitions=2020-05-25_10:2020-05-25,2020-05-25 signatures=0 Received: from [17.235.11.87] (unknown [17.235.11.87]) by rn-mailsvcp-mmp-lapp04.rno.apple.com (Oracle Communications Messaging Server 8.1.0.5.20200312 64bit (built Mar 12 2020)) with ESMTPSA id <0QAX010N17L7IR00@rn-mailsvcp-mmp-lapp04.rno.apple.com>; Mon, 25 May 2020 21:10:20 -0700 (PDT) From: "Andrew Fish" Message-id: <9D1DBCDB-9B2D-4DB2-89C9-F89458C0AA72@apple.com> MIME-version: 1.0 (Mac OS X Mail 13.0 \(3594.4.17\)) Subject: Re: [edk2-devel] [PATCH 3/3] OvmfwPkg: Don't exclude XCODE Modules Date: Mon, 25 May 2020 21:10:19 -0700 In-reply-to: <63bcf199-3937-040c-dc2f-26b1d577ede5@redhat.com> Cc: Ard Biesheuvel , Jiewen Yao , Jordan Justen , =?utf-8?Q?Philippe_Mathieu-Daud=C3=A9?= To: edk2-devel-groups-io , Laszlo Ersek References: <215ac3c5d0c73779d06b6d7463000ee8d1d526fe.1590354726.git.afish@apple.com> <63bcf199-3937-040c-dc2f-26b1d577ede5@redhat.com> X-Mailer: Apple Mail (2.3594.4.17) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.216,18.0.687 definitions=2020-05-25_10:2020-05-25,2020-05-25 signatures=0 Content-type: multipart/alternative; boundary="Apple-Mail=_44CFA435-7F07-4960-A2CE-19F5A5B0181C" --Apple-Mail=_44CFA435-7F07-4960-A2CE-19F5A5B0181C Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On May 25, 2020, at 12:31 PM, Laszlo Ersek wrote: >=20 > Hi Andrew, >=20 > 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. >>=20 >> Cc: Ard Biesheuvel >> Cc: Jiewen Yao >> Cc: Jordan Justen >> Cc: Philippe Mathieu-Daud=C3=A9 >> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D557 >> Signed-off-by: Andrew Fish >>=20 >> Signed-off-by: Andrew Fish >> --- >> 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(-) >=20 Laszlo, Thanks for the feedback.=20 Can I ask that you go to https://www.tianocore.org, click on How to Contri= bute and point me at the chain of links I did not follow, if I missed it ti= t is likely due to too many links and too much information being vended. Wh= en people are starting out we should vend them the instructions that work a= nd let them opt in to learning more.=20 > (1) Please run "BaseTools/Scripts/SetupGit.py" in your edk2 clone, > because right now, the patch is formatted/posted with too many CR > characters. >=20 I filed https://bugzilla.tianocore.org/show_bug.cgi?id=3D2767 since I pass= ed 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). >=20 > (3) As the diffstat above indicates it too, the > "OvmfPkg/OvmfPkgIa32X64.dsc" update is inconsistent with the other DSC > file updates, namely in whitespace. >=20 > 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". >=20 > (4) There's a typo in the subject line of this patch; please replace > "OvmfwPkg" with "OvmfPkg". >=20 > Thank you! > Laszlo >=20 >> 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 >>=20 >> !endif >>=20 >>=20 >>=20 >> -!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" >>=20 >> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { >>=20 >> >>=20 >> gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE >>=20 >> @@ -887,7 +886,7 @@ [Components] >> >>=20 >> gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE >>=20 >> } >>=20 >> -!endif >>=20 >> + >>=20 >> ShellPkg/Application/Shell/Shell.inf { >>=20 >> >>=20 >> ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCom= mandLib.inf >>=20 >> 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 >>=20 >> INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf >>=20 >>=20 >>=20 >> -!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" >>=20 >> INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf >>=20 >> INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellComm= and.inf >>=20 >> -!endif >>=20 >> INF ShellPkg/Application/Shell/Shell.inf >>=20 >>=20 >>=20 >> INF MdeModulePkg/Logo/LogoDxe.inf >>=20 >> 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 >>=20 >> !endif >>=20 >>=20 >>=20 >> -!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" >>=20 >> + >>=20 >> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { >>=20 >> >>=20 >> gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE >>=20 >> @@ -901,7 +901,7 @@ [Components.X64] >> >>=20 >> gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE >>=20 >> } >>=20 >> -!endif >>=20 >> + >>=20 >> ShellPkg/Application/Shell/Shell.inf { >>=20 >> >>=20 >> ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCom= mandLib.inf >>=20 >> 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 >>=20 >> INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf >>=20 >>=20 >>=20 >> -!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" >>=20 >> INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf >>=20 >> INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellComm= and.inf >>=20 >> -!endif >>=20 >> INF ShellPkg/Application/Shell/Shell.inf >>=20 >>=20 >>=20 >> INF MdeModulePkg/Logo/LogoDxe.inf >>=20 >> 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 >>=20 >> !endif >>=20 >>=20 >>=20 >> -!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" >>=20 >> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { >>=20 >> >>=20 >> gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE >>=20 >> @@ -897,7 +896,7 @@ [Components] >> >>=20 >> gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE >>=20 >> } >>=20 >> -!endif >>=20 >> + >>=20 >> ShellPkg/Application/Shell/Shell.inf { >>=20 >> >>=20 >> ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCom= mandLib.inf >>=20 >> 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 >>=20 >> INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf >>=20 >>=20 >>=20 >> -!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" >>=20 >> INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf >>=20 >> INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellComm= and.inf >>=20 >> -!endif >>=20 >> INF ShellPkg/Application/Shell/Shell.inf >>=20 >>=20 >>=20 >> INF MdeModulePkg/Logo/LogoDxe.inf >>=20 >> 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 >>=20 >> !endif >>=20 >>=20 >>=20 >> -!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" >>=20 >> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { >>=20 >> >>=20 >> gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE >>=20 >> @@ -679,7 +678,7 @@ [Components] >> >>=20 >> gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE >>=20 >> } >>=20 >> -!endif >>=20 >> + >>=20 >> ShellPkg/Application/Shell/Shell.inf { >>=20 >> >>=20 >> ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCom= mandLib.inf >>=20 >> 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 >>=20 >> INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf >>=20 >>=20 >>=20 >> -!if $(TOOL_CHAIN_TAG) !=3D "XCODE5" >>=20 >> INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf >>=20 >> INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellComm= and.inf >>=20 >> -!endif >>=20 >> INF ShellPkg/Application/Shell/Shell.inf >>=20 >>=20 >>=20 >> INF MdeModulePkg/Logo/LogoDxe.inf >>=20 >=20 >=20 >=20 --Apple-Mail=_44CFA435-7F07-4960-A2CE-19F5A5B0181C Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=utf-8

On May 25, 2= 020, 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: Jie= wen Yao <jiewen.yao@i= ntel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Philippe Mathieu-Daud=C3=A9 <philmd@redhat.com>
Ref: https://bugzi= lla.tianocore.org/show_bug.cgi?id=3D557
Signed-off-by: An= drew Fish <afish@apple.com= >

Signed-off-by: Andrew Fish <afish@apple.com>
---
OvmfPkg/OvmfPkgIa32.dsc    | 3 +--
OvmfPkg/OvmfPkgIa32.fdf    | 2 --
Ov= mfPkg/OvmfPkgIa32X64.dsc | 4 ++--
OvmfPkg/OvmfPkgIa32X64.fdf = | 2 --
OvmfPkg/OvmfPkgX64.dsc     | 3 +--=
OvmfPkg/OvmfPkgX64.fdf     | 2 --
OvmfPkg/OvmfXen.dsc        | 3 += --
OvmfPkg/OvmfXen.fdf       &n= bsp;| 2 --
8 files changed, 5 insertions(+), 16 deletions(-)<= br class=3D"">


Laszlo,

<= /div>
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 s= tarting 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<= br style=3D"caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 1= 2px; font-style: normal; font-variant-caps: normal; font-weight: normal; le= tter-spacing: normal; text-align: start; text-indent: 0px; text-transform: = none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0p= x; text-decoration: none;" class=3D"">characters.


I filed https://bugzilla.ti= anocore.org/show_bug.cgi?id=3D2767 since I passed PatchCheck.py bu= t 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 d= irectly 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 inconsist= ent 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
bef= ore Shell.inf, and another before "TftpDynamicCommand.inf".

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

Thank you!
Laszlo

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

!endif



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

  She= llPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {

    <PcdsFixedAtBuild>

      gEfiShellPkgTo= kenSpaceGuid.PcdShellLibAutoInitialize|FALSE

@= @ -887,7 +886,7 @@ [Components]
    <P= cdsFixedAtBuild>

    &n= bsp; gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

  }

-!endif
+

  Shel= lPkg/Application/Shell/Shell.inf {

  = ;  <LibraryClasses>

 &nbs= p;    ShellCommandLib|ShellPkg/Library/UefiShellCommand= Lib/UefiShellCommandLib.inf

diff --git a/OvmfP= kg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
index e2b759aa8d= 05..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_T= AG) !=3D "XCODE5"

INF  ShellPkg/DynamicCo= mmand/TftpDynamicCommand/TftpDynamicCommand.inf

INF  OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellC= ommand.inf

-!endif

INF  ShellPkg/Application/Shell/Shell.inf



INF MdeModulePkg/Logo/LogoDxe.inf

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

!endif



-!if $(T= OOL_CHAIN_TAG) !=3D "XCODE5"

+
<= br class=3D"">  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDy= namicCommand.inf {

    <= ;PcdsFixedAtBuild>

    =   gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

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

      gEfiShellPkgTokenSpaceGuid.PcdSh= ellLibAutoInitialize|FALSE

  }

-!endif

+

  ShellPkg/Application/Shell/Shell.inf {

    <LibraryClasses>

      ShellCommandLib|= ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
=
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa3= 2X64.fdf
index bfca1eff9e83..4cd4dd652a9f 100644
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X= 64.fdf
@@ -289,10 +289,8 @@ [FV.DXEFV]
INF &nbs= p;FatPkg/EnhancedFatDxe/Fat.inf

INF  MdeM= odulePkg/Universal/Disk/UdfDxe/UdfDxe.inf



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

INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpD= ynamicCommand.inf

INF  OvmfPkg/LinuxInitr= dDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf

-!endif

INF  ShellPkg/Applicati= on/Shell/Shell.inf



INF MdeModulePkg/Logo/LogoDxe.inf

diff --gi= t a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index f7f= e75ebf531..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) !=3D "XCODE5"

  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCo= mmand.inf {

    <PcdsFi= xedAtBuild>

     &= nbsp;gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

@@ -897,7 +896,7 @@ [Components]
 &nbs= p;  <PcdsFixedAtBuild>

 &= nbsp;    gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInit= ialize|FALSE

  }

-!endif

+

  ShellPkg/Application/Shell/Shell.inf {

    <LibraryClasses>

      ShellCommandLib|ShellPkg/Libra= ry/UefiShellCommandLib/UefiShellCommandLib.inf

diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index bfca1eff9e83..4cd4dd652a9f 100644
--- a/OvmfPkg/OvmfPk= gX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -289,1= 0 +289,8 @@ [FV.DXEFV]
INF  FatPkg/EnhancedFatDxe/Fat.in= f

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



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

INF  She= llPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf

INF  OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInit= rdDynamicShellCommand.inf

-!endif

INF  ShellPkg/Application/Shell/Shell.inf



INF MdeModulePkg/Logo/LogoD= xe.inf

diff --git a/OvmfPkg/OvmfXen.dsc b/Ovmf= Pkg/OvmfXen.dsc
index 3af0ee705407..0c11d4732628 100644
--- a/OvmfPkg/OvmfXen.dsc
+++ b/OvmfPkg/OvmfXen.dsc<= br class=3D"">@@ -670,7 +670,6 @@ [Components]
  Ov= mfPkg/Csm/Csm16/Csm16.inf

!endif



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

  ShellPkg/DynamicCommand/Tf= tpDynamicCommand/TftpDynamicCommand.inf {

&nbs= p;   <PcdsFixedAtBuild>

&= nbsp;     gEfiShellPkgTokenSpaceGuid.PcdShellLibAu= toInitialize|FALSE

@@ -679,7 +678,7 @@ [Compon= ents]
    <PcdsFixedAtBuild>

      gEfiShellPkgToke= nSpaceGuid.PcdShellLibAutoInitialize|FALSE

&nb= sp; }

-!endif

+

  ShellPkg/Application/Shell/She= ll.inf {

    <LibraryCl= asses>

      = ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.in= f

diff --git a/OvmfPkg/OvmfXen.fdf b/OvmfPkg/O= vmfXen.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) !=3D "XCODE5"

INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCom= mand.inf

INF  OvmfPkg/LinuxInitrdDynamicS= hellCommand/LinuxInitrdDynamicShellCommand.inf

-!endif

INF  ShellPkg/Application/Shell/= Shell.inf



INF Md= eModulePkg/Logo/LogoDxe.inf




--Apple-Mail=_44CFA435-7F07-4960-A2CE-19F5A5B0181C--