From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from ma1-aaemail-dr-lapp03.apple.com (ma1-aaemail-dr-lapp03.apple.com [17.171.2.72]) by mx.groups.io with SMTP id smtpd.web10.21316.1590355279981045202 for ; Sun, 24 May 2020 14:21:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@apple.com header.s=20180706 header.b=PBFUMwU4; spf=pass (domain: apple.com, ip: 17.171.2.72, mailfrom: afish@apple.com) Received: from pps.filterd (ma1-aaemail-dr-lapp03.apple.com [127.0.0.1]) by ma1-aaemail-dr-lapp03.apple.com (8.16.0.42/8.16.0.42) with SMTP id 04OLBSVp008435; Sun, 24 May 2020 14:21:16 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apple.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=20180706; bh=pnd2XLOjvs+smIGBPSptJUaDtSl6N7xEsb1pmW3hgwE=; b=PBFUMwU4UI5Ogj4wbhj7sXSWrMA/XsDjlPVWjWL6HIZT1JnKv+fBDBO3Z3LPV4lGfMAI /lTKCNgDIVbgsdDdOhhSVT5OpKJoTxUCfBr7k+nQRfikwRV8uMhFMq09DQOIjOad3TbS 78+I9qMs7eM1Gofa5LQnSLQkBhgeSNMzwvOJfzqIrjADnnW+y87mldJf6KRuerNvEkuX GeNBfYnPs0nRUc8RaI1T/iZWTSd+3PTaF+pap5m8Ts1QXsLbowfIpgdP/U3Rko3Y5q5+ ijfn8ZoxIWp549TSSbCAP7vnjtGLMtC/yiok8XZRBydMQ41xhIxJFOCJE7ZyiQCBzBFZ qg== Received: from rn-mailsvcp-mta-lapp04.rno.apple.com (rn-mailsvcp-mta-lapp04.rno.apple.com [10.225.203.152]) by ma1-aaemail-dr-lapp03.apple.com with ESMTP id 3172tubtks-9 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Sun, 24 May 2020 14:21:16 -0700 Received: from rn-mailsvcp-relay-lapp04.rno.apple.com (rn-mailsvcp-relay-lapp04.rno.apple.com [17.179.253.13]) by rn-mailsvcp-mta-lapp04.rno.apple.com (Oracle Communications Messaging Server 8.1.0.5.20200312 64bit (built Mar 12 2020)) with ESMTPS id <0QAU00J0YTZG6340@rn-mailsvcp-mta-lapp04.rno.apple.com>; Sun, 24 May 2020 14:21:16 -0700 (PDT) Received: from process_milters-daemon.rn-mailsvcp-relay-lapp04.rno.apple.com by rn-mailsvcp-relay-lapp04.rno.apple.com (Oracle Communications Messaging Server 8.1.0.5.20200312 64bit (built Mar 12 2020)) id <0QAU00E00TR7MK00@rn-mailsvcp-relay-lapp04.rno.apple.com>; Sun, 24 May 2020 14:21:16 -0700 (PDT) X-Va-A: X-Va-T-CD: 678bf7de5df0d9ff994f556fd1b44182 X-Va-E-CD: 31370a619bc63566ab9206dfd03ab4c3 X-Va-R-CD: 8e4877de4c05e0cb3c576bcd87c903b5 X-Va-CD: 0 X-Va-ID: 9a05a763-5e90-4c4c-980e-dd82ebfa5942 X-V-A: X-V-T-CD: 678bf7de5df0d9ff994f556fd1b44182 X-V-E-CD: 31370a619bc63566ab9206dfd03ab4c3 X-V-R-CD: 8e4877de4c05e0cb3c576bcd87c903b5 X-V-CD: 0 X-V-ID: bf0ce6c6-3094-4aa8-955d-d350121ab779 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.216,18.0.676 definitions=2020-05-24_07:2020-05-22,2020-05-24 signatures=0 Received: from rn-mailsvcp-relay-lapp02.rno.apple.com (unknown [17.235.51.71]) by rn-mailsvcp-relay-lapp04.rno.apple.com (Oracle Communications Messaging Server 8.1.0.5.20200312 64bit (built Mar 12 2020)) with ESMTP id <0QAU00NJ9TYDAE00@rn-mailsvcp-relay-lapp04.rno.apple.com>; Sun, 24 May 2020 14:21:16 -0700 (PDT) From: "Andrew Fish" To: devel@edk2.groups.io Cc: Andrew Fish , Ard Biesheuvel , Jiewen Yao , Jordan Justen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 3/3] OvmfwPkg: Don't exclude XCODE Modules Date: Sun, 24 May 2020 14:20:11 -0700 Message-id: <215ac3c5d0c73779d06b6d7463000ee8d1d526fe.1590354726.git.afish@apple.com> X-Mailer: git-send-email 2.24.1 (Apple Git-126) In-reply-to: References: MIME-version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.216,18.0.676 definitions=2020-05-24_07:2020-05-22,2020-05-24 signatures=0 Content-type: text/plain; charset=UTF-8 Content-transfer-encoding: quoted-printable With this BZ getting fixed we no longer need to special case XCODE. 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 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(-) 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=0D !endif=0D =0D -!if $(TOOL_CHAIN_TAG) !=3D "XCODE5"=0D ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {=0D =0D gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE=0D @@ -887,7 +886,7 @@ [Components] =0D gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE=0D }=0D -!endif=0D +=0D ShellPkg/Application/Shell/Shell.inf {=0D =0D ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellComman= dLib.inf=0D 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=0D INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf=0D =0D -!if $(TOOL_CHAIN_TAG) !=3D "XCODE5"=0D INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf=0D INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand= .inf=0D -!endif=0D INF ShellPkg/Application/Shell/Shell.inf=0D =0D INF MdeModulePkg/Logo/LogoDxe.inf=0D 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=0D !endif=0D =0D -!if $(TOOL_CHAIN_TAG) !=3D "XCODE5"=0D +=0D ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {=0D =0D gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE=0D @@ -901,7 +901,7 @@ [Components.X64] =0D gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE=0D }=0D -!endif=0D +=0D ShellPkg/Application/Shell/Shell.inf {=0D =0D ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellComman= dLib.inf=0D 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=0D INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf=0D =0D -!if $(TOOL_CHAIN_TAG) !=3D "XCODE5"=0D INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf=0D INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand= .inf=0D -!endif=0D INF ShellPkg/Application/Shell/Shell.inf=0D =0D INF MdeModulePkg/Logo/LogoDxe.inf=0D 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=0D !endif=0D =0D -!if $(TOOL_CHAIN_TAG) !=3D "XCODE5"=0D ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {=0D =0D gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE=0D @@ -897,7 +896,7 @@ [Components] =0D gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE=0D }=0D -!endif=0D +=0D ShellPkg/Application/Shell/Shell.inf {=0D =0D ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellComman= dLib.inf=0D 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=0D INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf=0D =0D -!if $(TOOL_CHAIN_TAG) !=3D "XCODE5"=0D INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf=0D INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand= .inf=0D -!endif=0D INF ShellPkg/Application/Shell/Shell.inf=0D =0D INF MdeModulePkg/Logo/LogoDxe.inf=0D 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=0D !endif=0D =0D -!if $(TOOL_CHAIN_TAG) !=3D "XCODE5"=0D ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {=0D =0D gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE=0D @@ -679,7 +678,7 @@ [Components] =0D gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE=0D }=0D -!endif=0D +=0D ShellPkg/Application/Shell/Shell.inf {=0D =0D ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellComman= dLib.inf=0D 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=0D INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf=0D =0D -!if $(TOOL_CHAIN_TAG) !=3D "XCODE5"=0D INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf=0D INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand= .inf=0D -!endif=0D INF ShellPkg/Application/Shell/Shell.inf=0D =0D INF MdeModulePkg/Logo/LogoDxe.inf=0D --=20 2.24.1 (Apple Git-126)