From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (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 CA15B81787 for ; Tue, 17 Jan 2017 00:04:17 -0800 (PST) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga101.jf.intel.com with ESMTP; 17 Jan 2017 00:04:18 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,243,1477983600"; d="scan'208";a="49601273" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by orsmga004.jf.intel.com with ESMTP; 17 Jan 2017 00:04:17 -0800 Received: from FMSMSX110.amr.corp.intel.com (10.18.116.10) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.248.2; Tue, 17 Jan 2017 00:04:17 -0800 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by fmsmsx110.amr.corp.intel.com (10.18.116.10) with Microsoft SMTP Server (TLS) id 14.3.248.2; Tue, 17 Jan 2017 00:04:17 -0800 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.20]) by shsmsx102.ccr.corp.intel.com ([169.254.2.88]) with mapi id 14.03.0248.002; Tue, 17 Jan 2017 16:04:13 +0800 From: "Wu, Jiaxin" To: Gary Lin , "edk2-devel@lists.01.org" CC: Laszlo Ersek , "Justen, Jordan L" , "Long, Qin" Thread-Topic: [PATCH 2/3] OvmfPkg: correct the set of modules included for the IPv6 stack Thread-Index: AQHScH2XV043vXIcYkatzDUAWoZQN6E8T2qQ Date: Tue, 17 Jan 2017 08:04:13 +0000 Message-ID: <895558F6EA4E3B41AC93A00D163B7274162946A5@SHSMSX103.ccr.corp.intel.com> References: <20170117045232.4765-1-glin@suse.com> <20170117045232.4765-3-glin@suse.com> In-Reply-To: <20170117045232.4765-3-glin@suse.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiOGFmMzQwYWItZGE2Yy00MjRkLThmMjgtOWVlZDM0NWQ0OTNhIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE1LjkuNi42IiwiVHJ1c3RlZExhYmVsSGFzaCI6Im0wdGprblJqQzVyMkllc2xsbzRidXBQb0NtMkt1TExXdjU2RkFnc3E5a1k9In0= x-ctpclassification: CTP_IC x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH 2/3] OvmfPkg: correct the set of modules included for the IPv6 stack X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Jan 2017 08:04:17 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Wu Jiaxin > -----Original Message----- > From: Gary Lin [mailto:glin@suse.com] > Sent: Tuesday, January 17, 2017 12:53 PM > To: edk2-devel@lists.01.org > Cc: Laszlo Ersek ; Justen, Jordan L > ; Wu, Jiaxin ; Long, Qin > > Subject: [PATCH 2/3] OvmfPkg: correct the set of modules included for the= IPv6 > stack >=20 > Always use IScsiDxe from NetworkPkg when IPv6 is enabled since it provide= s > the complete ISCSI support. >=20 > NOTE: This makes OpenSSL a hard requirement when NETWORK_IP6_ENABLE > is > true. >=20 > (Based on Jiaxin's suggestion) >=20 > Cc: Laszlo Ersek > Cc: Justen Jordan L > Cc: Wu Jiaxin > Cc: Long Qin > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Gary Lin > --- > OvmfPkg/OvmfPkgIa32.dsc | 11 ++++------- > OvmfPkg/OvmfPkgIa32.fdf | 4 ---- > OvmfPkg/OvmfPkgIa32X64.dsc | 11 ++++------- > OvmfPkg/OvmfPkgIa32X64.fdf | 4 ---- > OvmfPkg/OvmfPkgX64.dsc | 11 ++++------- > OvmfPkg/OvmfPkgX64.fdf | 4 ---- > 6 files changed, 12 insertions(+), 33 deletions(-) >=20 > diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc > index 9aa66eb951..77287920e2 100644 > --- a/OvmfPkg/OvmfPkgIa32.dsc > +++ b/OvmfPkg/OvmfPkgIa32.dsc > @@ -148,15 +148,16 @@ [LibraryClasses] >=20 > PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf >=20 > TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmM > easurementLib.inf > AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.in= f > -!if $(NETWORK_IP6_ENABLE) =3D=3D TRUE > - TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf > -!endif > !else >=20 > TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/Tpm > MeasurementLibNull.inf >=20 > AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLib > Null.inf > !endif > VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf >=20 > +!if $(NETWORK_IP6_ENABLE) =3D=3D TRUE > + TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf > +!endif > + > !if $(HTTP_BOOT_ENABLE) =3D=3D TRUE > HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf > !endif > @@ -697,12 +698,8 @@ [Components] > NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf > NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf > NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > -!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE > NetworkPkg/IScsiDxe/IScsiDxe.inf > !else > - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > -!endif > -!else > MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf > index 34d57a6079..069e21b7d0 100644 > --- a/OvmfPkg/OvmfPkgIa32.fdf > +++ b/OvmfPkg/OvmfPkgIa32.fdf > @@ -314,12 +314,8 @@ [FV.DXEFV] > INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf > INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf > INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > -!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE > INF NetworkPkg/IScsiDxe/IScsiDxe.inf > !else > - INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > -!endif > -!else > INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc > index 9537e92077..64a7c16d2f 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.dsc > +++ b/OvmfPkg/OvmfPkgIa32X64.dsc > @@ -153,15 +153,16 @@ [LibraryClasses] >=20 > PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf >=20 > TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmM > easurementLib.inf > AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.in= f > -!if $(NETWORK_IP6_ENABLE) =3D=3D TRUE > - TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf > -!endif > !else >=20 > TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/Tpm > MeasurementLibNull.inf >=20 > AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLib > Null.inf > !endif > VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf >=20 > +!if $(NETWORK_IP6_ENABLE) =3D=3D TRUE > + TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf > +!endif > + > !if $(HTTP_BOOT_ENABLE) =3D=3D TRUE > HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf > !endif > @@ -706,12 +707,8 @@ [Components.X64] > NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf > NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf > NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > -!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE > NetworkPkg/IScsiDxe/IScsiDxe.inf > !else > - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > -!endif > -!else > MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf > index df55c2b210..f29feb27b4 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.fdf > +++ b/OvmfPkg/OvmfPkgIa32X64.fdf > @@ -314,12 +314,8 @@ [FV.DXEFV] > INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf > INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf > INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > -!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE > INF NetworkPkg/IScsiDxe/IScsiDxe.inf > !else > - INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > -!endif > -!else > INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc > index d15294eb72..ac4bf4f63e 100644 > --- a/OvmfPkg/OvmfPkgX64.dsc > +++ b/OvmfPkg/OvmfPkgX64.dsc > @@ -153,15 +153,16 @@ [LibraryClasses] >=20 > PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf >=20 > TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmM > easurementLib.inf > AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.in= f > -!if $(NETWORK_IP6_ENABLE) =3D=3D TRUE > - TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf > -!endif > !else >=20 > TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/Tpm > MeasurementLibNull.inf >=20 > AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLib > Null.inf > !endif > VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf >=20 > +!if $(NETWORK_IP6_ENABLE) =3D=3D TRUE > + TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf > +!endif > + > !if $(HTTP_BOOT_ENABLE) =3D=3D TRUE > HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf > !endif > @@ -704,12 +705,8 @@ [Components] > NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf > NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf > NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > -!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE > NetworkPkg/IScsiDxe/IScsiDxe.inf > !else > - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > -!endif > -!else > MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf > index 5e2e1dfaf5..8d66da099f 100644 > --- a/OvmfPkg/OvmfPkgX64.fdf > +++ b/OvmfPkg/OvmfPkgX64.fdf > @@ -314,12 +314,8 @@ [FV.DXEFV] > INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf > INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf > INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > -!if $(SECURE_BOOT_ENABLE) =3D=3D TRUE > INF NetworkPkg/IScsiDxe/IScsiDxe.inf > !else > - INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > -!endif > -!else > INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > -- > 2.11.0