On 5 November 2018 at 23:46, Laszlo Ersek <[email protected]> wrote: > On 11/05/18 11:49, Fu Siyuan wrote: >> V2: >> Add missed library instance for NetworkPkg iSCSI driver. >> >> This patch replaces the MdeModulePkg TCP, PXE and iSCSI driver with those >> ones in NetworkPkg. These 3 drivers in MdeModulePkg are not being actively >> maintained and will be removed from edk2 master soon. >> >> Cc: Jordan Justen <[email protected]> >> Cc: Laszlo Ersek <[email protected]> >> Cc: Ard Biesheuvel <[email protected]> >> Cc: Anthony Perard <[email protected]> >> Cc: Julien Grall <[email protected]> >> Contributed-under: TianoCore Contribution Agreement 1.1 >> Signed-off-by: Fu Siyuan <[email protected]> >> --- >> OvmfPkg/OvmfPkgIa32.dsc | 14 ++++---------- >> OvmfPkg/OvmfPkgIa32.fdf | 10 +++------- >> OvmfPkg/OvmfPkgIa32X64.dsc | 14 ++++---------- >> OvmfPkg/OvmfPkgIa32X64.fdf | 10 +++------- >> OvmfPkg/OvmfPkgX64.dsc | 14 ++++---------- >> OvmfPkg/OvmfPkgX64.fdf | 10 +++------- >> 6 files changed, 21 insertions(+), 51 deletions(-) >> >> diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc >> index 9f07e75050c0..7160e88eaee4 100644 >> --- a/OvmfPkg/OvmfPkgIa32.dsc >> +++ b/OvmfPkg/OvmfPkgIa32.dsc >> @@ -189,9 +189,7 @@ [LibraryClasses] >> !endif >> VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf >> >> -!if $(NETWORK_IP6_ENABLE) == TRUE >> TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf >> -!endif >> >> !if $(HTTP_BOOT_ENABLE) == TRUE >> HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf >> @@ -790,18 +788,14 @@ [Components] >> MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf >> MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf >> MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf >> -!if $(NETWORK_IP6_ENABLE) == TRUE >> - NetworkPkg/Ip6Dxe/Ip6Dxe.inf >> + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf >> NetworkPkg/TcpDxe/TcpDxe.inf >> + NetworkPkg/IScsiDxe/IScsiDxe.inf >> +!if $(NETWORK_IP6_ENABLE) == TRUE >> + NetworkPkg/Ip6Dxe/Ip6Dxe.inf >> NetworkPkg/Udp6Dxe/Udp6Dxe.inf >> NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf >> NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf >> - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf >> - NetworkPkg/IScsiDxe/IScsiDxe.inf >> -!else >> - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf >> - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf >> - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf >> !endif >> !if $(HTTP_BOOT_ENABLE) == TRUE >> NetworkPkg/DnsDxe/DnsDxe.inf >> diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf >> index 52b8b1fea1fc..1bc2e73bde16 100644 >> --- a/OvmfPkg/OvmfPkgIa32.fdf >> +++ b/OvmfPkg/OvmfPkgIa32.fdf >> @@ -309,18 +309,14 @@ [FV.DXEFV] >> INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf >> INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf >> INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf >> + INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf >> + INF NetworkPkg/TcpDxe/TcpDxe.inf >> + INF NetworkPkg/IScsiDxe/IScsiDxe.inf >> !if $(NETWORK_IP6_ENABLE) == TRUE >> INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf >> - INF NetworkPkg/TcpDxe/TcpDxe.inf >> INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf >> INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf >> INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf >> - INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf >> - INF NetworkPkg/IScsiDxe/IScsiDxe.inf >> -!else >> - INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf >> - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf >> - INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf >> !endif >> !if $(HTTP_BOOT_ENABLE) == TRUE >> INF NetworkPkg/DnsDxe/DnsDxe.inf >> diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc >> index a4eaeb808c6b..e83e7ffab5b5 100644 >> --- a/OvmfPkg/OvmfPkgIa32X64.dsc >> +++ b/OvmfPkg/OvmfPkgIa32X64.dsc >> @@ -194,9 +194,7 @@ [LibraryClasses] >> !endif >> VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf >> >> -!if $(NETWORK_IP6_ENABLE) == TRUE >> TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf >> -!endif >> >> !if $(HTTP_BOOT_ENABLE) == TRUE >> HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf >> @@ -799,18 +797,14 @@ [Components.X64] >> MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf >> MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf >> MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf >> -!if $(NETWORK_IP6_ENABLE) == TRUE >> - NetworkPkg/Ip6Dxe/Ip6Dxe.inf >> + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf >> NetworkPkg/TcpDxe/TcpDxe.inf >> + NetworkPkg/IScsiDxe/IScsiDxe.inf >> +!if $(NETWORK_IP6_ENABLE) == TRUE >> + NetworkPkg/Ip6Dxe/Ip6Dxe.inf >> NetworkPkg/Udp6Dxe/Udp6Dxe.inf >> NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf >> NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf >> - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf >> - NetworkPkg/IScsiDxe/IScsiDxe.inf >> -!else >> - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf >> - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf >> - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf >> !endif >> !if $(HTTP_BOOT_ENABLE) == TRUE >> NetworkPkg/DnsDxe/DnsDxe.inf >> diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf >> index 70845d6972fd..f36c7e741c8e 100644 >> --- a/OvmfPkg/OvmfPkgIa32X64.fdf >> +++ b/OvmfPkg/OvmfPkgIa32X64.fdf >> @@ -315,18 +315,14 @@ [FV.DXEFV] >> INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf >> INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf >> INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf >> + INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf >> + INF NetworkPkg/TcpDxe/TcpDxe.inf >> + INF NetworkPkg/IScsiDxe/IScsiDxe.inf >> !if $(NETWORK_IP6_ENABLE) == TRUE >> INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf >> - INF NetworkPkg/TcpDxe/TcpDxe.inf >> INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf >> INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf >> INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf >> - INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf >> - INF NetworkPkg/IScsiDxe/IScsiDxe.inf >> -!else >> - INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf >> - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf >> - INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf >> !endif >> !if $(HTTP_BOOT_ENABLE) == TRUE >> INF NetworkPkg/DnsDxe/DnsDxe.inf >> diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc >> index aa3efc5e73b9..c0f86d4ad303 100644 >> --- a/OvmfPkg/OvmfPkgX64.dsc >> +++ b/OvmfPkg/OvmfPkgX64.dsc >> @@ -194,9 +194,7 @@ [LibraryClasses] >> !endif >> VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf >> >> -!if $(NETWORK_IP6_ENABLE) == TRUE >> TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf >> -!endif >> >> !if $(HTTP_BOOT_ENABLE) == TRUE >> HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf >> @@ -797,18 +795,14 @@ [Components] >> MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf >> MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf >> MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf >> -!if $(NETWORK_IP6_ENABLE) == TRUE >> - NetworkPkg/Ip6Dxe/Ip6Dxe.inf >> + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf >> NetworkPkg/TcpDxe/TcpDxe.inf >> + NetworkPkg/IScsiDxe/IScsiDxe.inf >> +!if $(NETWORK_IP6_ENABLE) == TRUE >> + NetworkPkg/Ip6Dxe/Ip6Dxe.inf >> NetworkPkg/Udp6Dxe/Udp6Dxe.inf >> NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf >> NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf >> - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf >> - NetworkPkg/IScsiDxe/IScsiDxe.inf >> -!else >> - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf >> - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf >> - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf >> !endif >> !if $(HTTP_BOOT_ENABLE) == TRUE >> NetworkPkg/DnsDxe/DnsDxe.inf >> diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf >> index 1eb46ac9a2d8..96a114a20bdc 100644 >> --- a/OvmfPkg/OvmfPkgX64.fdf >> +++ b/OvmfPkg/OvmfPkgX64.fdf >> @@ -315,18 +315,14 @@ [FV.DXEFV] >> INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf >> INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf >> INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf >> + INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf >> + INF NetworkPkg/TcpDxe/TcpDxe.inf >> + INF NetworkPkg/IScsiDxe/IScsiDxe.inf >> !if $(NETWORK_IP6_ENABLE) == TRUE >> INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf >> - INF NetworkPkg/TcpDxe/TcpDxe.inf >> INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf >> INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf >> INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf >> - INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf >> - INF NetworkPkg/IScsiDxe/IScsiDxe.inf >> -!else >> - INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf >> - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf >> - INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf >> !endif >> !if $(HTTP_BOOT_ENABLE) == TRUE >> INF NetworkPkg/DnsDxe/DnsDxe.inf >> > > Assuming we consider "NetworkPkg/IScsiDxe/IScsiDxe.inf" an integral part > of the edk2 networking stack, without which (and its OpenSSL dependency) > noone would ever want to build OVMF, this patch is OK. > > I don't know what other OVMF users think about this; personally I'm ok > with it. > > Reviewed-by: Laszlo Ersek <[email protected]> >
I think that is fine. Reviewed-by: Ard Biesheuvel <[email protected]> Since the delta between NETWORK_IP6_ENABLE on vs off is decreasing, any chance we could drop it altogether at some point? _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
