From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=209.132.183.28; helo=mx1.redhat.com; envelope-from=lersek@redhat.com; receiver=edk2-devel@lists.01.org Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id AB6502119489A for ; Fri, 23 Nov 2018 04:10:35 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 02EF63001392; Fri, 23 Nov 2018 12:10:35 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-112.rdu2.redhat.com [10.10.120.112]) by smtp.corp.redhat.com (Postfix) with ESMTP id D98CD60E3F; Fri, 23 Nov 2018 12:10:33 +0000 (UTC) To: Fu Siyuan , edk2-devel@lists.01.org Cc: Anthony Perard , Jordan Justen References: <20181122052153.89464-1-siyuan.fu@intel.com> <20181122052153.89464-6-siyuan.fu@intel.com> From: Laszlo Ersek Message-ID: Date: Fri, 23 Nov 2018 13:10:32 +0100 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: <20181122052153.89464-6-siyuan.fu@intel.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Fri, 23 Nov 2018 12:10:35 +0000 (UTC) Subject: Re: [PATCH v2 5/6] OvmfPkg: Update DSC/FDF to use NetworkPkg's include fragment file. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Nov 2018 12:10:35 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Another comment for this patch: On 11/22/18 06:21, Fu Siyuan wrote: > This patch updates the platform DSC/FDF files to use the include fragment > files provided by NetworkPkg. > The feature enabling flags in [Defines] section have been updated to use > the NetworkPkg's terms, and the value has been overridden with the original > default value on this platform. > > This patch also rename the TLS_ENABLE flag to PLATFORM_TLS_ENABLE for the > platform specific configuration for TLS support. > > Cc: Jordan Justen > Cc: Laszlo Ersek > Cc: Ard Biesheuvel > Cc: Anthony Perard > Cc: Julien Grall > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Fu Siyuan > --- > > Notes: > v2: > Rename TLS_ENABLE flag to PLATFORM_TLS_ENABLE flag for platform specific configuration for TLS support. > > OvmfPkg/OvmfPkgIa32.dsc | 75 +++++++++---------- > OvmfPkg/OvmfPkgIa32.fdf | 27 +------ > OvmfPkg/OvmfPkgIa32X64.dsc | 76 +++++++++----------- > OvmfPkg/OvmfPkgIa32X64.fdf | 27 +------ > OvmfPkg/OvmfPkgX64.dsc | 75 +++++++++---------- > OvmfPkg/OvmfPkgX64.fdf | 27 +------ > 6 files changed, 102 insertions(+), 205 deletions(-) It catches my eye that the IA32X64 dsc file has a different "changed line count" from the others (76 vs. 75). And, indeed, there is a bug: > diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf > index f7f9ab06bb5a..995328992ccf 100644 > --- a/OvmfPkg/OvmfPkgIa32.fdf > +++ b/OvmfPkg/OvmfPkgIa32.fdf > @@ -509,10 +519,10 @@ [PcdsFixedAtBuild] > gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x2 > !endif > > -[PcdsFixedAtBuild.X64] > -!if $(HTTP_BOOT_ENABLE) == TRUE > - gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE > -!endif > + # > + # Network Pcds > + # > +!include NetworkPkg/NetworkPcds.dsc.inc > > gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 } > (5) Please do not remove the [PcdsFixedAtBuild.X64] section header. Thanks, Laszlo