From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.120]) by mx.groups.io with SMTP id smtpd.web12.37662.1590435107176894765 for ; Mon, 25 May 2020 12:31:47 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=iCfz4C64; spf=pass (domain: redhat.com, ip: 207.211.31.120, mailfrom: lersek@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590435106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KgEpnta19uEqFG/a6rgjwZ0RfYu4d7Tk/ls++6LdVmM=; b=iCfz4C64ebMDEulqYkXvsFFKpGARUsBubWVxjUAuXVd4LeM8dYiiX65t4YoNjHrurJSkE+ EPvAIap+TpNyLggz7CSvTkIE7wj7Jix2kGrSdB08GrT7EEpRNU7Fu2gmjUZ8ZOn+X+Cj8K jznY1nwHRqxJz43YWA7rFaWb2PU3v7I= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-495-fzozcLjyOhm-ceI4hW3wIg-1; Mon, 25 May 2020 15:31:39 -0400 X-MC-Unique: fzozcLjyOhm-ceI4hW3wIg-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DDA9C1005512; Mon, 25 May 2020 19:31:37 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-114-168.ams2.redhat.com [10.36.114.168]) by smtp.corp.redhat.com (Postfix) with ESMTP id DB71910013D2; Mon, 25 May 2020 19:31:35 +0000 (UTC) Subject: Re: [edk2-devel] [PATCH 3/3] OvmfwPkg: Don't exclude XCODE Modules To: devel@edk2.groups.io, afish@apple.com Cc: Ard Biesheuvel , Jiewen Yao , Jordan Justen , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= References: <215ac3c5d0c73779d06b6d7463000ee8d1d526fe.1590354726.git.afish@apple.com> From: "Laszlo Ersek" Message-ID: <63bcf199-3937-040c-dc2f-26b1d577ede5@redhat.com> Date: Mon, 25 May 2020 21:31:34 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <215ac3c5d0c73779d06b6d7463000ee8d1d526fe.1590354726.git.afish@apple.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit 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 > Cc: Jiewen Yao > Cc: Jordan Justen > Cc: Philippe Mathieu-Daudé > Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=557 > 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(-) (1) Please run "BaseTools/Scripts/SetupGit.py" in your edk2 clone, because right now, the patch is formatted/posted with too many CR characters. (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 { > > > > gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > > @@ -887,7 +886,7 @@ [Components] > > > gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > > } > > -!endif > > + > > ShellPkg/Application/Shell/Shell.inf { > > > > 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 { > > > > gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > > @@ -901,7 +901,7 @@ [Components.X64] > > > gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > > } > > -!endif > > + > > ShellPkg/Application/Shell/Shell.inf { > > > > 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 { > > > > gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > > @@ -897,7 +896,7 @@ [Components] > > > gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > > } > > -!endif > > + > > ShellPkg/Application/Shell/Shell.inf { > > > > 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 { > > > > gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > > @@ -679,7 +678,7 @@ [Components] > > > gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > > } > > -!endif > > + > > ShellPkg/Application/Shell/Shell.inf { > > > > 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 >