[Patch 0/3] Update Package DSC for Network module movement

[Patch 0/3] Update Package DSC for Network module movement

[Liming Gao]

Network modules have been moved to NetworkPkg. Some package dsc files 
are required to be updated.

1. Remove unused NetLib
2. Update Package DSC to refer to NetworkLibs.dsc.inc

Liming Gao (3):
  UefiPayloadPkg: Update Package DSC files to refer to
    NetworkLibs.dsc.inc
  ArmPkg: Update Package DSC to remove unused NetLib
  SignedCapsulePkg: Update Package DSC to remove unused network libs

 ArmPkg/ArmPkg.dsc                        | 1 -
 SignedCapsulePkg/SignedCapsulePkg.dsc    | 5 -----
 UefiPayloadPkg/UefiPayloadPkgIa32.dsc    | 2 +-
 UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc | 2 +-
 4 files changed, 2 insertions(+), 8 deletions(-)

-- 
2.13.0.windows.1

[Patch 1/3] UefiPayloadPkg: Update Package DSC files to refer to NetworkLibs.dsc.inc

[Liming Gao]

Signed-off-by: Liming Gao <liming.gao@intel.com>
Cc: Guo Dong <guo.dong@intel.com>
---
 UefiPayloadPkg/UefiPayloadPkgIa32.dsc    | 2 +-
 UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/UefiPayloadPkg/UefiPayloadPkgIa32.dsc b/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
index 13983d0895..5b6ed36e9c 100644
--- a/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
+++ b/UefiPayloadPkg/UefiPayloadPkgIa32.dsc
@@ -516,7 +516,7 @@
   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
   ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
+  !include NetworkPkg/NetworkLibs.dsc.inc
 
 [Components.IA32]
   ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
diff --git a/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc b/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc
index dc38d6528e..d57b5241dc 100644
--- a/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc
+++ b/UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc
@@ -517,7 +517,7 @@
   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
   ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
+  !include NetworkPkg/NetworkLibs.dsc.inc
 
 [Components.X64]
   ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
-- 
2.13.0.windows.1

[Patch 2/3] ArmPkg: Update Package DSC to remove unused NetLib

[Liming Gao]

Signed-off-by: Liming Gao <liming.gao@intel.com>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 ArmPkg/ArmPkg.dsc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc
index 25c6ccaeb6..5f090d3087 100644
--- a/ArmPkg/ArmPkg.dsc
+++ b/ArmPkg/ArmPkg.dsc
@@ -47,7 +47,6 @@
   PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
   PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
 
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
   UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
   HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
 
-- 
2.13.0.windows.1

[Patch 3/3] SignedCapsulePkg: Update Package DSC to remove unused network libs

[Liming Gao]

Signed-off-by: Liming Gao <liming.gao@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Chao Zhang <chao.b.zhang@intel.com>
---
 SignedCapsulePkg/SignedCapsulePkg.dsc | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/SignedCapsulePkg/SignedCapsulePkg.dsc b/SignedCapsulePkg/SignedCapsulePkg.dsc
index 0da445503b..4d4232d6e0 100644
--- a/SignedCapsulePkg/SignedCapsulePkg.dsc
+++ b/SignedCapsulePkg/SignedCapsulePkg.dsc
@@ -61,11 +61,6 @@
   #
   UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
   UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
-  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
   SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
   TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
   SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf
-- 
2.13.0.windows.1

Re: [Patch 2/3] ArmPkg: Update Package DSC to remove unused NetLib

[Ard Biesheuvel]

On Tue, 28 May 2019 at 13:42, Liming Gao <liming.gao@intel.com> wrote:
>
> Signed-off-by: Liming Gao <liming.gao@intel.com>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Thanks Liming

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

I spotted these as well, in case you weren't aware:

SignedCapsulePkg/SignedCapsulePkg.dsc:
NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
UefiPayloadPkg/UefiPayloadPkgIa32.dsc:
NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc:
NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf


> ---
>  ArmPkg/ArmPkg.dsc | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc
> index 25c6ccaeb6..5f090d3087 100644
> --- a/ArmPkg/ArmPkg.dsc
> +++ b/ArmPkg/ArmPkg.dsc
> @@ -47,7 +47,6 @@
>    PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf
>    PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
>
> -  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
>    UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
>    HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
>
> --
> 2.13.0.windows.1
>

Re: [edk2-devel] [Patch 0/3] Update Package DSC for Network module movement

[Ard Biesheuvel]

On Tue, 28 May 2019 at 13:42, Liming Gao <liming.gao@intel.com> wrote:
>
> Network modules have been moved to NetworkPkg. Some package dsc files
> are required to be updated.
>
> 1. Remove unused NetLib
> 2. Update Package DSC to refer to NetworkLibs.dsc.inc
>
> Liming Gao (3):
>   UefiPayloadPkg: Update Package DSC files to refer to
>     NetworkLibs.dsc.inc
>   ArmPkg: Update Package DSC to remove unused NetLib
>   SignedCapsulePkg: Update Package DSC to remove unused network libs
>
>  ArmPkg/ArmPkg.dsc                        | 1 -
>  SignedCapsulePkg/SignedCapsulePkg.dsc    | 5 -----
>  UefiPayloadPkg/UefiPayloadPkgIa32.dsc    | 2 +-
>  UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc | 2 +-
>  4 files changed, 2 insertions(+), 8 deletions(-)
>

OK, I see you already spotted the other ones

For the series,

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Re: [edk2-devel] [Patch 0/3] Update Package DSC for Network module movement

[Guo Dong]

Reviewed-by: Guo Dong <guo.dong@intel.com>


> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
> Liming Gao
> Sent: Tuesday, May 28, 2019 4:42 AM
> To: devel@edk2.groups.io
> Subject: [edk2-devel] [Patch 0/3] Update Package DSC for Network module
> movement
> 
> Network modules have been moved to NetworkPkg. Some package dsc files
> are required to be updated.
> 
> 1. Remove unused NetLib
> 2. Update Package DSC to refer to NetworkLibs.dsc.inc
> 
> Liming Gao (3):
>   UefiPayloadPkg: Update Package DSC files to refer to
>     NetworkLibs.dsc.inc
>   ArmPkg: Update Package DSC to remove unused NetLib
>   SignedCapsulePkg: Update Package DSC to remove unused network libs
> 
>  ArmPkg/ArmPkg.dsc                        | 1 -
>  SignedCapsulePkg/SignedCapsulePkg.dsc    | 5 -----
>  UefiPayloadPkg/UefiPayloadPkgIa32.dsc    | 2 +-
>  UefiPayloadPkg/UefiPayloadPkgIa32X64.dsc | 2 +-
>  4 files changed, 2 insertions(+), 8 deletions(-)
> 
> --
> 2.13.0.windows.1
> 
> 
> 

Re: [Patch 3/3] SignedCapsulePkg: Update Package DSC to remove unused network libs

[Zhang, Chao B]

Reviewed-by : Chao Zhang <chao.b.zhang@intel.com>

-----Original Message-----
From: Gao, Liming 
Sent: Tuesday, May 28, 2019 7:42 PM
To: devel@edk2.groups.io
Cc: Yao, Jiewen <jiewen.yao@intel.com>; Zhang, Chao B <chao.b.zhang@intel.com>
Subject: [Patch 3/3] SignedCapsulePkg: Update Package DSC to remove unused network libs

Signed-off-by: Liming Gao <liming.gao@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Chao Zhang <chao.b.zhang@intel.com>
---
 SignedCapsulePkg/SignedCapsulePkg.dsc | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/SignedCapsulePkg/SignedCapsulePkg.dsc b/SignedCapsulePkg/SignedCapsulePkg.dsc
index 0da445503b..4d4232d6e0 100644
--- a/SignedCapsulePkg/SignedCapsulePkg.dsc
+++ b/SignedCapsulePkg/SignedCapsulePkg.dsc
@@ -61,11 +61,6 @@
   #
   UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf
   UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf
-  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
-  IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
-  UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
-  TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
-  DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
   SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
   TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
   SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf
-- 
2.13.0.windows.1