[PATCH v3 0/6] Fix build failure due to tftp/dp library removal

public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed

* [PATCH v3 0/6] Fix build failure due to tftp/dp library removal
@ 2017-11-29  0:59 Ruiyu Ni
  2017-11-29  0:59 ` [PATCH v3 1/6] ShellPkg/tftp: Correct file comments header of Tftp.uni Ruiyu Ni
                   ` (5 more replies)
  0 siblings, 6 replies; 20+ messages in thread
From: Ruiyu Ni @ 2017-11-29  0:59 UTC (permalink / raw)
  To: edk2-devel

commit 0961002 and 92034c4 converted the tftp and dp from NULL class
library to dynamic command drivers.
Some platforms referencing the original tftp/dp NULL class libraries
need the platform DSC/FDF change to reference to the new dynamic
command drivers.

v3: Fix the patch issue in BeagleBordPkg change, which wrongly removed
    UefiShellNetwork1CommandsLib.
    Update OvmfPkg change to correct the copyright year and add more
    commit message.

v2: v1 still causes build failures. I tried best to verify the build.
    OVMF boot is also tried.

Ruiyu Ni (6):
  ShellPkg/tftp: Correct file comments header of Tftp.uni
  EmulatorPkg: Fix build failure due to Tftp library removal
  ArmVirtPkg: Fix build failure due to Tftp library removal
  BeagleBoardPkg: Fix build failure due to Tftp library removal
  CorebootPayloadPkg: Fix build failure due to Tftp/Dp library removal
  OvmfPkg: Add tftp dynamic command

 ArmVirtPkg/ArmVirt.dsc.inc                         | 11 ++++---
 ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc               |  3 +-
 ArmVirtPkg/ArmVirtXen.fdf                          |  3 +-
 BeagleBoardPkg/BeagleBoardPkg.dsc                  | 16 +++++-----
 BeagleBoardPkg/BeagleBoardPkg.fdf                  |  3 +-
 CorebootPayloadPkg/CorebootPayloadPkg.fdf          |  4 ++-
 CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc      | 36 ++++++++++++----------
 CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc   | 36 ++++++++++++----------
 EmulatorPkg/EmulatorPkg.dsc                        | 10 +++---
 EmulatorPkg/EmulatorPkg.fdf                        |  3 +-
 OvmfPkg/OvmfPkgIa32.dsc                            |  7 +++--
 OvmfPkg/OvmfPkgIa32.fdf                            |  3 +-
 OvmfPkg/OvmfPkgIa32X64.dsc                         |  7 +++--
 OvmfPkg/OvmfPkgIa32X64.fdf                         |  3 +-
 OvmfPkg/OvmfPkgX64.dsc                             |  7 +++--
 OvmfPkg/OvmfPkgX64.fdf                             |  3 +-
 .../DynamicCommand/TftpDynamicCommand/Tftp.uni     |  4 +--
 17 files changed, 94 insertions(+), 65 deletions(-)

-- 
2.15.0.gvfs.1.preview.4



^ permalink raw reply	[flat|nested] 20+ messages in thread

* [PATCH v3 1/6] ShellPkg/tftp: Correct file comments header of Tftp.uni
  2017-11-29  0:59 [PATCH v3 0/6] Fix build failure due to tftp/dp library removal Ruiyu Ni
@ 2017-11-29  0:59 ` Ruiyu Ni
  2017-11-29  0:59 ` [PATCH v3 2/6] EmulatorPkg: Fix build failure due to Tftp library removal Ruiyu Ni
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 20+ messages in thread
From: Ruiyu Ni @ 2017-11-29  0:59 UTC (permalink / raw)
  To: edk2-devel

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
---
 ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.uni | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.uni b/ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.uni
index 4f4447d67a..1393ba5679 100644
--- a/ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.uni
+++ b/ShellPkg/DynamicCommand/TftpDynamicCommand/Tftp.uni
@@ -1,7 +1,7 @@
 // /**
 //
 // (C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP<BR>
-// Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved. <BR>
+// Copyright (c) 2010 - 2017, Intel Corporation. All rights reserved. <BR>
 // This program and the accompanying materials
 // are licensed and made available under the terms and conditions of the BSD License
 // which accompanies this distribution. The full text of the license may be found at
@@ -12,7 +12,7 @@
 //
 // Module Name:
 //
-// UefiShellTftpCommandLib.uni
+// Tftp.uni
 //
 // Abstract:
 //
-- 
2.15.0.gvfs.1.preview.4



^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [PATCH v3 2/6] EmulatorPkg: Fix build failure due to Tftp library removal
  2017-11-29  0:59 [PATCH v3 0/6] Fix build failure due to tftp/dp library removal Ruiyu Ni
  2017-11-29  0:59 ` [PATCH v3 1/6] ShellPkg/tftp: Correct file comments header of Tftp.uni Ruiyu Ni
@ 2017-11-29  0:59 ` Ruiyu Ni
  2017-11-29  0:59 ` [PATCH v3 3/6] ArmVirtPkg: " Ruiyu Ni
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 20+ messages in thread
From: Ruiyu Ni @ 2017-11-29  0:59 UTC (permalink / raw)
  To: edk2-devel; +Cc: Jordan Justen, Andrew Fish

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Andrew Fish <afish@apple.com>
---
 EmulatorPkg/EmulatorPkg.dsc | 10 ++++++----
 EmulatorPkg/EmulatorPkg.fdf |  3 ++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc
index ce0ae64dba..818691ce3a 100644
--- a/EmulatorPkg/EmulatorPkg.dsc
+++ b/EmulatorPkg/EmulatorPkg.dsc
@@ -109,6 +109,8 @@ [LibraryClasses]
   VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
   SortLib|MdeModulePkg/Library/BaseSortLib/BaseSortLib.inf
   UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
+  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
+  FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
 
 [LibraryClasses.common.SEC]
   PeiServicesLib|EmulatorPkg/Library/SecPeiServicesLib/SecPeiServicesLib.inf
@@ -378,6 +380,10 @@ [Components]
   FatPkg/EnhancedFatDxe/Fat.inf
 
 !ifndef $(USE_OLD_SHELL)
+  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
+    <PcdsFixedAtBuild>
+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
+  }
   ShellPkg/Application/Shell/Shell.inf {
     <LibraryClasses>
       ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
@@ -388,12 +394,8 @@ [Components]
       NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
       NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
       NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
-      NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf
       HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
-      ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
-      FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
       SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
-      UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
       PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
 #      SafeBlockIoLib|ShellPkg/Library/SafeBlockIoLib/SafeBlockIoLib.inf
 #      SafeOpenProtocolLib|ShellPkg/Library/SafeOpenProtocolLib/SafeOpenProtocolLib.inf
diff --git a/EmulatorPkg/EmulatorPkg.fdf b/EmulatorPkg/EmulatorPkg.fdf
index 377de59b5a..314eb7b895 100644
--- a/EmulatorPkg/EmulatorPkg.fdf
+++ b/EmulatorPkg/EmulatorPkg.fdf
@@ -1,7 +1,7 @@
 ## @file
 # This is Emulator FDF file with UEFI HII features enabled
 #
-# Copyright (c) 2008 - 2015, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2008 - 2017, Intel Corporation. All rights reserved.<BR>
 # Portions copyright (c) 2009 - 2011, Apple Inc. All rights reserved.<BR>
 #
 # This program and the accompanying materials
@@ -206,6 +206,7 @@ [FV.FvRecovery]
 INF FatPkg/EnhancedFatDxe/Fat.inf
 
 !ifndef $(USE_OLD_SHELL)
+INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 INF  ShellPkg/Application/Shell/Shell.inf
 !else
 INF  RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf
-- 
2.15.0.gvfs.1.preview.4



^ permalink raw reply related	[flat|nested] 20+ messages in thread

* [PATCH v3 3/6] ArmVirtPkg: Fix build failure due to Tftp library removal
  2017-11-29  0:59 [PATCH v3 0/6] Fix build failure due to tftp/dp library removal Ruiyu Ni
  2017-11-29  0:59 ` [PATCH v3 1/6] ShellPkg/tftp: Correct file comments header of Tftp.uni Ruiyu Ni
  2017-11-29  0:59 ` [PATCH v3 2/6] EmulatorPkg: Fix build failure due to Tftp library removal Ruiyu Ni
@ 2017-11-29  0:59 ` Ruiyu Ni
  2017-11-29  9:36   ` Ni, Ruiyu
  2017-11-29 11:06   ` Laszlo Ersek
  2017-11-29  0:59 ` [PATCH v3 4/6] BeagleBoardPkg: " Ruiyu Ni
                   ` (2 subsequent siblings)
  5 siblings, 2 replies; 20+ messages in thread
From: Ruiyu Ni @ 2017-11-29  0:59 UTC (permalink / raw)
  To: edk2-devel; +Cc: Laszlo Ersek, Ard Biesheuvel, Julien Grall

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Julien Grall <julien.grall@linaro.org>
---
 ArmVirtPkg/ArmVirt.dsc.inc           | 11 +++++++----
 ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc |  3 ++-
 ArmVirtPkg/ArmVirtXen.fdf            |  3 ++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
index 5d7edff104..9874637a3d 100644
--- a/ArmVirtPkg/ArmVirt.dsc.inc
+++ b/ArmVirtPkg/ArmVirt.dsc.inc
@@ -1,7 +1,7 @@
 #
 #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
 #  Copyright (c) 2014, Linaro Limited. All rights reserved.
-#  Copyright (c) 2015, Intel Corporation. All rights reserved.
+#  Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -55,6 +55,8 @@ [LibraryClasses.common]
   HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
   UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
   SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
+  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
+  FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
 
   UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
   OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf
@@ -217,8 +219,6 @@ [LibraryClasses.common.UEFI_APPLICATION]
   PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
   MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
   HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
-  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
-  FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
 
 [LibraryClasses.common.UEFI_DRIVER]
   UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
@@ -383,6 +383,10 @@ [Components.common]
   #
   # UEFI application (Shell Embedded Boot Loader)
   #
+  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
+    <PcdsFixedAtBuild>
+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
+  }
   ShellPkg/Application/Shell/Shell.inf {
     <LibraryClasses>
       ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
@@ -393,7 +397,6 @@ [Components.common]
       NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
       NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
       NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
-      NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf
       HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
       PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
       BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf
diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
index 744006d13c..89f95b2d99 100644
--- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
+++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
@@ -1,7 +1,7 @@
 #
 #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
 #  Copyright (c) 2014-2016, Linaro Limited. All rights reserved.
-#  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
+#  Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -103,6 +103,7 @@ [FV.FvMain]
   # UEFI application (Shell Embedded Boot Loader)
   #
   INF ShellPkg/Application/Shell/Shell.inf
+  INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 
   #
   # Bds
diff --git a/ArmVirtPkg/ArmVirtXen.fdf b/ArmVirtPkg/ArmVirtXen.fdf
index 70e76df228..6586ce6be5 100644
--- a/ArmVirtPkg/ArmVirtXen.fdf
+++ b/ArmVirtPkg/ArmVirtXen.fdf
@@ -1,7 +1,7 @@
 #
 #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
 #  Copyright (c) 2014, Linaro Limited. All rights reserved.
-#  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -169,6 +169,7 @@ [FV.FvMain]
   # UEFI application (Shell Embedded Boot Loader)
   #
   INF ShellPkg/Application/Shell/Shell.inf
+  INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 
   #
   # Bds
-- 
2.15.0.gvfs.1.preview.4



^ permalink raw reply related	[flat|nested] 20+ messages in thread

* Re: [PATCH v3 3/6] ArmVirtPkg: Fix build failure due to Tftp library removal
  2017-11-29  0:59 ` [PATCH v3 3/6] ArmVirtPkg: " Ruiyu Ni
@ 2017-11-29  9:36   ` Ni, Ruiyu
  2017-11-29  9:44     ` Ard Biesheuvel
  2017-11-29 11:06   ` Laszlo Ersek
  1 sibling, 1 reply; 20+ messages in thread
From: Ni, Ruiyu @ 2017-11-29  9:36 UTC (permalink / raw)
  To: Ni, Ruiyu, edk2-devel@lists.01.org; +Cc: Laszlo Ersek, Ard Biesheuvel

Ard,
Would you mind to give a r-b for this patch?

Thanks/Ray

> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Ruiyu Ni
> Sent: Wednesday, November 29, 2017 9:00 AM
> To: edk2-devel@lists.01.org
> Cc: Laszlo Ersek <lersek@redhat.com>; Ard Biesheuvel
> <ard.biesheuvel@linaro.org>
> Subject: [edk2] [PATCH v3 3/6] ArmVirtPkg: Fix build failure due to Tftp
> library removal
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Julien Grall <julien.grall@linaro.org>
> ---
>  ArmVirtPkg/ArmVirt.dsc.inc           | 11 +++++++----
>  ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc |  3 ++-
>  ArmVirtPkg/ArmVirtXen.fdf            |  3 ++-
>  3 files changed, 11 insertions(+), 6 deletions(-)
> 
> diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc index
> 5d7edff104..9874637a3d 100644
> --- a/ArmVirtPkg/ArmVirt.dsc.inc
> +++ b/ArmVirtPkg/ArmVirt.dsc.inc
> @@ -1,7 +1,7 @@
>  #
>  #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
>  #  Copyright (c) 2014, Linaro Limited. All rights reserved.
> -#  Copyright (c) 2015, Intel Corporation. All rights reserved.
> +#  Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
>  #
>  #  This program and the accompanying materials  #  are licensed and made
> available under the terms and conditions of the BSD License @@ -55,6 +55,8
> @@ [LibraryClasses.common]
>    HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
> 
> UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiService
> sLib.inf
>    SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
> +  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
> +  FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
> 
>    UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
> 
> OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeL
> ib/BaseOrderedCollectionRedBlackTreeLib.inf
> @@ -217,8 +219,6 @@ [LibraryClasses.common.UEFI_APPLICATION]
> 
> PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerforma
> nceLib.inf
> 
> MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemo
> ryAllocationLib.inf
>    HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
> -  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
> -  FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
> 
>  [LibraryClasses.common.UEFI_DRIVER]
> 
> UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCusto
> mDecompressLib/BaseUefiTianoCustomDecompressLib.inf
> @@ -383,6 +383,10 @@ [Components.common]
>    #
>    # UEFI application (Shell Embedded Boot Loader)
>    #
> +
> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.
> inf {
> +    <PcdsFixedAtBuild>
> +      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> +  }
>    ShellPkg/Application/Shell/Shell.inf {
>      <LibraryClasses>
> 
> ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellComma
> ndLib.inf
> @@ -393,7 +397,6 @@ [Components.common]
> 
> NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Com
> mandsLib.inf
> 
> NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1Com
> mandsLib.inf
> 
> NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1
> CommandsLib.inf
> -
> NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib
> .inf
> 
> HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingL
> ib.inf
>        PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
> 
> BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfg
> CommandLib.inf
> diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> index 744006d13c..89f95b2d99 100644
> --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> @@ -1,7 +1,7 @@
>  #
>  #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
>  #  Copyright (c) 2014-2016, Linaro Limited. All rights reserved.
> -#  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
> +#  Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
>  #
>  #  This program and the accompanying materials  #  are licensed and made
> available under the terms and conditions of the BSD License @@ -103,6
> +103,7 @@ [FV.FvMain]
>    # UEFI application (Shell Embedded Boot Loader)
>    #
>    INF ShellPkg/Application/Shell/Shell.inf
> +  INF
> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.
> inf
> 
>    #
>    # Bds
> diff --git a/ArmVirtPkg/ArmVirtXen.fdf b/ArmVirtPkg/ArmVirtXen.fdf index
> 70e76df228..6586ce6be5 100644
> --- a/ArmVirtPkg/ArmVirtXen.fdf
> +++ b/ArmVirtPkg/ArmVirtXen.fdf
> @@ -1,7 +1,7 @@
>  #
>  #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
>  #  Copyright (c) 2014, Linaro Limited. All rights reserved.
> -#  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
> +#  Copyright (c) 2015 - 2017, Intel Corporation. All rights
> +reserved.<BR>
>  #
>  #  This program and the accompanying materials  #  are licensed and made
> available under the terms and conditions of the BSD License @@ -169,6
> +169,7 @@ [FV.FvMain]
>    # UEFI application (Shell Embedded Boot Loader)
>    #
>    INF ShellPkg/Application/Shell/Shell.inf
> +  INF
> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.
> inf
> 
>    #
>    # Bds
> --
> 2.15.0.gvfs.1.preview.4
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel


^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PATCH v3 3/6] ArmVirtPkg: Fix build failure due to Tftp library removal
  2017-11-29  9:36   ` Ni, Ruiyu
@ 2017-11-29  9:44     ` Ard Biesheuvel
  2017-11-29  9:57       ` Ni, Ruiyu
  0 siblings, 1 reply; 20+ messages in thread
From: Ard Biesheuvel @ 2017-11-29  9:44 UTC (permalink / raw)
  To: Ni, Ruiyu; +Cc: edk2-devel@lists.01.org, Laszlo Ersek

On 29 November 2017 at 09:36, Ni, Ruiyu <ruiyu.ni@intel.com> wrote:
> Ard,
> Would you mind to give a r-b for this patch?
>

Hi Ray,

Could you please incorporate the feedback you received from Laszlo
first? Thanks.


>
>> -----Original Message-----
>> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
>> Ruiyu Ni
>> Sent: Wednesday, November 29, 2017 9:00 AM
>> To: edk2-devel@lists.01.org
>> Cc: Laszlo Ersek <lersek@redhat.com>; Ard Biesheuvel
>> <ard.biesheuvel@linaro.org>
>> Subject: [edk2] [PATCH v3 3/6] ArmVirtPkg: Fix build failure due to Tftp
>> library removal
>>
>> Contributed-under: TianoCore Contribution Agreement 1.1
>> Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
>> Cc: Laszlo Ersek <lersek@redhat.com>
>> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>> Cc: Julien Grall <julien.grall@linaro.org>
>> ---
>>  ArmVirtPkg/ArmVirt.dsc.inc           | 11 +++++++----
>>  ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc |  3 ++-
>>  ArmVirtPkg/ArmVirtXen.fdf            |  3 ++-
>>  3 files changed, 11 insertions(+), 6 deletions(-)
>>
>> diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc index
>> 5d7edff104..9874637a3d 100644
>> --- a/ArmVirtPkg/ArmVirt.dsc.inc
>> +++ b/ArmVirtPkg/ArmVirt.dsc.inc
>> @@ -1,7 +1,7 @@
>>  #
>>  #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
>>  #  Copyright (c) 2014, Linaro Limited. All rights reserved.
>> -#  Copyright (c) 2015, Intel Corporation. All rights reserved.
>> +#  Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
>>  #
>>  #  This program and the accompanying materials  #  are licensed and made
>> available under the terms and conditions of the BSD License @@ -55,6 +55,8
>> @@ [LibraryClasses.common]
>>    HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
>>
>> UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiService
>> sLib.inf
>>    SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
>> +  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
>> +  FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
>>
>>    UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
>>
>> OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeL
>> ib/BaseOrderedCollectionRedBlackTreeLib.inf
>> @@ -217,8 +219,6 @@ [LibraryClasses.common.UEFI_APPLICATION]
>>
>> PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerforma
>> nceLib.inf
>>
>> MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemo
>> ryAllocationLib.inf
>>    HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
>> -  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
>> -  FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
>>
>>  [LibraryClasses.common.UEFI_DRIVER]
>>
>> UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCusto
>> mDecompressLib/BaseUefiTianoCustomDecompressLib.inf
>> @@ -383,6 +383,10 @@ [Components.common]
>>    #
>>    # UEFI application (Shell Embedded Boot Loader)
>>    #
>> +
>> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.
>> inf {
>> +    <PcdsFixedAtBuild>
>> +      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
>> +  }
>>    ShellPkg/Application/Shell/Shell.inf {
>>      <LibraryClasses>
>>
>> ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellComma
>> ndLib.inf
>> @@ -393,7 +397,6 @@ [Components.common]
>>
>> NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Com
>> mandsLib.inf
>>
>> NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1Com
>> mandsLib.inf
>>
>> NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1
>> CommandsLib.inf
>> -
>> NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib
>> .inf
>>
>> HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingL
>> ib.inf
>>        PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
>>
>> BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfg
>> CommandLib.inf
>> diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
>> b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
>> index 744006d13c..89f95b2d99 100644
>> --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
>> +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
>> @@ -1,7 +1,7 @@
>>  #
>>  #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
>>  #  Copyright (c) 2014-2016, Linaro Limited. All rights reserved.
>> -#  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
>> +#  Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
>>  #
>>  #  This program and the accompanying materials  #  are licensed and made
>> available under the terms and conditions of the BSD License @@ -103,6
>> +103,7 @@ [FV.FvMain]
>>    # UEFI application (Shell Embedded Boot Loader)
>>    #
>>    INF ShellPkg/Application/Shell/Shell.inf
>> +  INF
>> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.
>> inf
>>
>>    #
>>    # Bds
>> diff --git a/ArmVirtPkg/ArmVirtXen.fdf b/ArmVirtPkg/ArmVirtXen.fdf index
>> 70e76df228..6586ce6be5 100644
>> --- a/ArmVirtPkg/ArmVirtXen.fdf
>> +++ b/ArmVirtPkg/ArmVirtXen.fdf
>> @@ -1,7 +1,7 @@
>>  #
>>  #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
>>  #  Copyright (c) 2014, Linaro Limited. All rights reserved.
>> -#  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
>> +#  Copyright (c) 2015 - 2017, Intel Corporation. All rights
>> +reserved.<BR>
>>  #
>>  #  This program and the accompanying materials  #  are licensed and made
>> available under the terms and conditions of the BSD License @@ -169,6
>> +169,7 @@ [FV.FvMain]
>>    # UEFI application (Shell Embedded Boot Loader)
>>    #
>>    INF ShellPkg/Application/Shell/Shell.inf
>> +  INF
>> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.
>> inf
>>
>>    #
>>    # Bds
>> --
>> 2.15.0.gvfs.1.preview.4
>>
>> _______________________________________________
>> edk2-devel mailing list
>> edk2-devel@lists.01.org
>> https://lists.01.org/mailman/listinfo/edk2-devel


^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PATCH v3 3/6] ArmVirtPkg: Fix build failure due to Tftp library removal
  2017-11-29  9:44     ` Ard Biesheuvel
@ 2017-11-29  9:57       ` Ni, Ruiyu
  2017-11-29  9:59         ` Ard Biesheuvel
  0 siblings, 1 reply; 20+ messages in thread
From: Ni, Ruiyu @ 2017-11-29  9:57 UTC (permalink / raw)
  To: Ard Biesheuvel; +Cc: edk2-devel@lists.01.org, Laszlo Ersek

I didn't see Laszlo provided any comments for this patch.
Did you mean the below comments from him for OvmfPkg's change?

(1) Please add the following to the commit message:
"The TFTP command was converted from a NULL class library instance to a dynamic shell command in commit 0961002352e9. This patch complements commit f9bc2f876326, which only removed the old library, but didn't add the new dynamic command."

Thanks/Ray

> -----Original Message-----
> From: Ard Biesheuvel [mailto:ard.biesheuvel@linaro.org]
> Sent: Wednesday, November 29, 2017 5:45 PM
> To: Ni, Ruiyu <ruiyu.ni@intel.com>
> Cc: edk2-devel@lists.01.org; Laszlo Ersek <lersek@redhat.com>
> Subject: Re: [edk2] [PATCH v3 3/6] ArmVirtPkg: Fix build failure due to Tftp
> library removal
> 
> On 29 November 2017 at 09:36, Ni, Ruiyu <ruiyu.ni@intel.com> wrote:
> > Ard,
> > Would you mind to give a r-b for this patch?
> >
> 
> Hi Ray,
> 
> Could you please incorporate the feedback you received from Laszlo first?
> Thanks.
> 
> 
> >
> >> -----Original Message-----
> >> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf
> >> Of Ruiyu Ni
> >> Sent: Wednesday, November 29, 2017 9:00 AM
> >> To: edk2-devel@lists.01.org
> >> Cc: Laszlo Ersek <lersek@redhat.com>; Ard Biesheuvel
> >> <ard.biesheuvel@linaro.org>
> >> Subject: [edk2] [PATCH v3 3/6] ArmVirtPkg: Fix build failure due to
> >> Tftp library removal
> >>
> >> Contributed-under: TianoCore Contribution Agreement 1.1
> >> Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
> >> Cc: Laszlo Ersek <lersek@redhat.com>
> >> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> >> Cc: Julien Grall <julien.grall@linaro.org>
> >> ---
> >>  ArmVirtPkg/ArmVirt.dsc.inc           | 11 +++++++----
> >>  ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc |  3 ++-
> >>  ArmVirtPkg/ArmVirtXen.fdf            |  3 ++-
> >>  3 files changed, 11 insertions(+), 6 deletions(-)
> >>
> >> diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
> >> index 5d7edff104..9874637a3d 100644
> >> --- a/ArmVirtPkg/ArmVirt.dsc.inc
> >> +++ b/ArmVirtPkg/ArmVirt.dsc.inc
> >> @@ -1,7 +1,7 @@
> >>  #
> >>  #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
> >>  #  Copyright (c) 2014, Linaro Limited. All rights reserved.
> >> -#  Copyright (c) 2015, Intel Corporation. All rights reserved.
> >> +#  Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
> >>  #
> >>  #  This program and the accompanying materials  #  are licensed and
> >> made available under the terms and conditions of the BSD License @@
> >> -55,6 +55,8 @@ [LibraryClasses.common]
> >>    HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
> >>
> >> UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiSer
> >> UefiHiiServicesLib|vice
> >> sLib.inf
> >>    SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
> >> +  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
> >> +
> >> + FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.in
> >> + f
> >>
> >>    UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
> >>
> >>
> OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTree
> >> OrderedCollectionLib|L
> >> ib/BaseOrderedCollectionRedBlackTreeLib.inf
> >> @@ -217,8 +219,6 @@ [LibraryClasses.common.UEFI_APPLICATION]
> >>
> >>
> PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerforma
> >> nceLib.inf
> >>
> >>
> MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemo
> >> ryAllocationLib.inf
> >>    HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
> >> -  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
> >> -
> >> FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
> >>
> >>  [LibraryClasses.common.UEFI_DRIVER]
> >>
> >>
> UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCusto
> >> mDecompressLib/BaseUefiTianoCustomDecompressLib.inf
> >> @@ -383,6 +383,10 @@ [Components.common]
> >>    #
> >>    # UEFI application (Shell Embedded Boot Loader)
> >>    #
> >> +
> >>
> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.
> >> inf {
> >> +    <PcdsFixedAtBuild>
> >> +      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> >> +  }
> >>    ShellPkg/Application/Shell/Shell.inf {
> >>      <LibraryClasses>
> >>
> >>
> ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellComma
> >> ndLib.inf
> >> @@ -393,7 +397,6 @@ [Components.common]
> >>
> >>
> NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Com
> >> mandsLib.inf
> >>
> >> NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1C
> >> NULL|om
> >> mandsLib.inf
> >>
> >>
> NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1
> >> CommandsLib.inf
> >> -
> >>
> NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib
> >> .inf
> >>
> >> HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandlePars
> >> HandleParsingLib|ingL
> >> ib.inf
> >>        PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
> >>
> >>
> BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfg
> >> CommandLib.inf
> >> diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> >> b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> >> index 744006d13c..89f95b2d99 100644
> >> --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> >> +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> >> @@ -1,7 +1,7 @@
> >>  #
> >>  #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
> >>  #  Copyright (c) 2014-2016, Linaro Limited. All rights reserved.
> >> -#  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
> >> +#  Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
> >>  #
> >>  #  This program and the accompanying materials  #  are licensed and
> >> made available under the terms and conditions of the BSD License @@
> >> -103,6
> >> +103,7 @@ [FV.FvMain]
> >>    # UEFI application (Shell Embedded Boot Loader)
> >>    #
> >>    INF ShellPkg/Application/Shell/Shell.inf
> >> +  INF
> >>
> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.
> >> inf
> >>
> >>    #
> >>    # Bds
> >> diff --git a/ArmVirtPkg/ArmVirtXen.fdf b/ArmVirtPkg/ArmVirtXen.fdf
> >> index
> >> 70e76df228..6586ce6be5 100644
> >> --- a/ArmVirtPkg/ArmVirtXen.fdf
> >> +++ b/ArmVirtPkg/ArmVirtXen.fdf
> >> @@ -1,7 +1,7 @@
> >>  #
> >>  #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
> >>  #  Copyright (c) 2014, Linaro Limited. All rights reserved.
> >> -#  Copyright (c) 2015 - 2016, Intel Corporation. All rights
> >> reserved.<BR>
> >> +#  Copyright (c) 2015 - 2017, Intel Corporation. All rights
> >> +reserved.<BR>
> >>  #
> >>  #  This program and the accompanying materials  #  are licensed and
> >> made available under the terms and conditions of the BSD License @@
> >> -169,6
> >> +169,7 @@ [FV.FvMain]
> >>    # UEFI application (Shell Embedded Boot Loader)
> >>    #
> >>    INF ShellPkg/Application/Shell/Shell.inf
> >> +  INF
> >>
> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.
> >> inf
> >>
> >>    #
> >>    # Bds
> >> --
> >> 2.15.0.gvfs.1.preview.4
> >>
> >> _______________________________________________
> >> edk2-devel mailing list
> >> edk2-devel@lists.01.org
> >> https://lists.01.org/mailman/listinfo/edk2-devel

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PATCH v3 3/6] ArmVirtPkg: Fix build failure due to Tftp library removal
  2017-11-29  9:57       ` Ni, Ruiyu
@ 2017-11-29  9:59         ` Ard Biesheuvel
  2017-11-29 10:03           ` Ni, Ruiyu
  0 siblings, 1 reply; 20+ messages in thread
From: Ard Biesheuvel @ 2017-11-29  9:59 UTC (permalink / raw)
  To: Ni, Ruiyu; +Cc: edk2-devel@lists.01.org, Laszlo Ersek

On 29 November 2017 at 09:57, Ni, Ruiyu <ruiyu.ni@intel.com> wrote:
> I didn't see Laszlo provided any comments for this patch.

https://lists.01.org/pipermail/edk2-devel/2017-November/018124.html

> Did you mean the below comments from him for OvmfPkg's change?
>
> (1) Please add the following to the commit message:
> "The TFTP command was converted from a NULL class library instance to a dynamic shell command in commit 0961002352e9. This patch complements commit f9bc2f876326, which only removed the old library, but didn't add the new dynamic command."
>
> Thanks/Ray
>
>> -----Original Message-----
>> From: Ard Biesheuvel [mailto:ard.biesheuvel@linaro.org]
>> Sent: Wednesday, November 29, 2017 5:45 PM
>> To: Ni, Ruiyu <ruiyu.ni@intel.com>
>> Cc: edk2-devel@lists.01.org; Laszlo Ersek <lersek@redhat.com>
>> Subject: Re: [edk2] [PATCH v3 3/6] ArmVirtPkg: Fix build failure due to Tftp
>> library removal
>>
>> On 29 November 2017 at 09:36, Ni, Ruiyu <ruiyu.ni@intel.com> wrote:
>> > Ard,
>> > Would you mind to give a r-b for this patch?
>> >
>>
>> Hi Ray,
>>
>> Could you please incorporate the feedback you received from Laszlo first?
>> Thanks.
>>
>>
>> >
>> >> -----Original Message-----
>> >> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf
>> >> Of Ruiyu Ni
>> >> Sent: Wednesday, November 29, 2017 9:00 AM
>> >> To: edk2-devel@lists.01.org
>> >> Cc: Laszlo Ersek <lersek@redhat.com>; Ard Biesheuvel
>> >> <ard.biesheuvel@linaro.org>
>> >> Subject: [edk2] [PATCH v3 3/6] ArmVirtPkg: Fix build failure due to
>> >> Tftp library removal
>> >>
>> >> Contributed-under: TianoCore Contribution Agreement 1.1
>> >> Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
>> >> Cc: Laszlo Ersek <lersek@redhat.com>
>> >> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>> >> Cc: Julien Grall <julien.grall@linaro.org>
>> >> ---
>> >>  ArmVirtPkg/ArmVirt.dsc.inc           | 11 +++++++----
>> >>  ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc |  3 ++-
>> >>  ArmVirtPkg/ArmVirtXen.fdf            |  3 ++-
>> >>  3 files changed, 11 insertions(+), 6 deletions(-)
>> >>
>> >> diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
>> >> index 5d7edff104..9874637a3d 100644
>> >> --- a/ArmVirtPkg/ArmVirt.dsc.inc
>> >> +++ b/ArmVirtPkg/ArmVirt.dsc.inc
>> >> @@ -1,7 +1,7 @@
>> >>  #
>> >>  #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
>> >>  #  Copyright (c) 2014, Linaro Limited. All rights reserved.
>> >> -#  Copyright (c) 2015, Intel Corporation. All rights reserved.
>> >> +#  Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
>> >>  #
>> >>  #  This program and the accompanying materials  #  are licensed and
>> >> made available under the terms and conditions of the BSD License @@
>> >> -55,6 +55,8 @@ [LibraryClasses.common]
>> >>    HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
>> >>
>> >> UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiSer
>> >> UefiHiiServicesLib|vice
>> >> sLib.inf
>> >>    SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
>> >> +  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
>> >> +
>> >> + FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.in
>> >> + f
>> >>
>> >>    UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
>> >>
>> >>
>> OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTree
>> >> OrderedCollectionLib|L
>> >> ib/BaseOrderedCollectionRedBlackTreeLib.inf
>> >> @@ -217,8 +219,6 @@ [LibraryClasses.common.UEFI_APPLICATION]
>> >>
>> >>
>> PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerforma
>> >> nceLib.inf
>> >>
>> >>
>> MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemo
>> >> ryAllocationLib.inf
>> >>    HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
>> >> -  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
>> >> -
>> >> FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
>> >>
>> >>  [LibraryClasses.common.UEFI_DRIVER]
>> >>
>> >>
>> UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCusto
>> >> mDecompressLib/BaseUefiTianoCustomDecompressLib.inf
>> >> @@ -383,6 +383,10 @@ [Components.common]
>> >>    #
>> >>    # UEFI application (Shell Embedded Boot Loader)
>> >>    #
>> >> +
>> >>
>> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.
>> >> inf {
>> >> +    <PcdsFixedAtBuild>
>> >> +      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
>> >> +  }
>> >>    ShellPkg/Application/Shell/Shell.inf {
>> >>      <LibraryClasses>
>> >>
>> >>
>> ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellComma
>> >> ndLib.inf
>> >> @@ -393,7 +397,6 @@ [Components.common]
>> >>
>> >>
>> NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Com
>> >> mandsLib.inf
>> >>
>> >> NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1C
>> >> NULL|om
>> >> mandsLib.inf
>> >>
>> >>
>> NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1
>> >> CommandsLib.inf
>> >> -
>> >>
>> NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib
>> >> .inf
>> >>
>> >> HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandlePars
>> >> HandleParsingLib|ingL
>> >> ib.inf
>> >>        PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
>> >>
>> >>
>> BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfg
>> >> CommandLib.inf
>> >> diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
>> >> b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
>> >> index 744006d13c..89f95b2d99 100644
>> >> --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
>> >> +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
>> >> @@ -1,7 +1,7 @@
>> >>  #
>> >>  #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
>> >>  #  Copyright (c) 2014-2016, Linaro Limited. All rights reserved.
>> >> -#  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
>> >> +#  Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
>> >>  #
>> >>  #  This program and the accompanying materials  #  are licensed and
>> >> made available under the terms and conditions of the BSD License @@
>> >> -103,6
>> >> +103,7 @@ [FV.FvMain]
>> >>    # UEFI application (Shell Embedded Boot Loader)
>> >>    #
>> >>    INF ShellPkg/Application/Shell/Shell.inf
>> >> +  INF
>> >>
>> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.
>> >> inf
>> >>
>> >>    #
>> >>    # Bds
>> >> diff --git a/ArmVirtPkg/ArmVirtXen.fdf b/ArmVirtPkg/ArmVirtXen.fdf
>> >> index
>> >> 70e76df228..6586ce6be5 100644
>> >> --- a/ArmVirtPkg/ArmVirtXen.fdf
>> >> +++ b/ArmVirtPkg/ArmVirtXen.fdf
>> >> @@ -1,7 +1,7 @@
>> >>  #
>> >>  #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
>> >>  #  Copyright (c) 2014, Linaro Limited. All rights reserved.
>> >> -#  Copyright (c) 2015 - 2016, Intel Corporation. All rights
>> >> reserved.<BR>
>> >> +#  Copyright (c) 2015 - 2017, Intel Corporation. All rights
>> >> +reserved.<BR>
>> >>  #
>> >>  #  This program and the accompanying materials  #  are licensed and
>> >> made available under the terms and conditions of the BSD License @@
>> >> -169,6
>> >> +169,7 @@ [FV.FvMain]
>> >>    # UEFI application (Shell Embedded Boot Loader)
>> >>    #
>> >>    INF ShellPkg/Application/Shell/Shell.inf
>> >> +  INF
>> >>
>> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.
>> >> inf
>> >>
>> >>    #
>> >>    # Bds
>> >> --
>> >> 2.15.0.gvfs.1.preview.4
>> >>
>> >> _______________________________________________
>> >> edk2-devel mailing list
>> >> edk2-devel@lists.01.org
>> >> https://lists.01.org/mailman/listinfo/edk2-devel


^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PATCH v3 3/6] ArmVirtPkg: Fix build failure due to Tftp library removal
  2017-11-29  9:59         ` Ard Biesheuvel
@ 2017-11-29 10:03           ` Ni, Ruiyu
  2017-11-29 10:05             ` Ard Biesheuvel
  0 siblings, 1 reply; 20+ messages in thread
From: Ni, Ruiyu @ 2017-11-29 10:03 UTC (permalink / raw)
  To: Ard Biesheuvel; +Cc: edk2-devel@lists.01.org, Laszlo Ersek

I see. Thanks.
I will revise the commit message and send out in V4.

BTW, which mail client are you using?
All mails from lists.01.org are flatly shown in my Outlook, which is very hard
to track.

Thanks/Ray

> -----Original Message-----
> From: Ard Biesheuvel [mailto:ard.biesheuvel@linaro.org]
> Sent: Wednesday, November 29, 2017 5:59 PM
> To: Ni, Ruiyu <ruiyu.ni@intel.com>
> Cc: edk2-devel@lists.01.org; Laszlo Ersek <lersek@redhat.com>
> Subject: Re: [edk2] [PATCH v3 3/6] ArmVirtPkg: Fix build failure due to Tftp
> library removal
> 
> On 29 November 2017 at 09:57, Ni, Ruiyu <ruiyu.ni@intel.com> wrote:
> > I didn't see Laszlo provided any comments for this patch.
> 
> https://lists.01.org/pipermail/edk2-devel/2017-November/018124.html
> 
> > Did you mean the below comments from him for OvmfPkg's change?
> >
> > (1) Please add the following to the commit message:
> > "The TFTP command was converted from a NULL class library instance to a
> dynamic shell command in commit 0961002352e9. This patch complements
> commit f9bc2f876326, which only removed the old library, but didn't add the
> new dynamic command."
> >
> > Thanks/Ray
> >
> >> -----Original Message-----
> >> From: Ard Biesheuvel [mailto:ard.biesheuvel@linaro.org]
> >> Sent: Wednesday, November 29, 2017 5:45 PM
> >> To: Ni, Ruiyu <ruiyu.ni@intel.com>
> >> Cc: edk2-devel@lists.01.org; Laszlo Ersek <lersek@redhat.com>
> >> Subject: Re: [edk2] [PATCH v3 3/6] ArmVirtPkg: Fix build failure due to
> Tftp
> >> library removal
> >>
> >> On 29 November 2017 at 09:36, Ni, Ruiyu <ruiyu.ni@intel.com> wrote:
> >> > Ard,
> >> > Would you mind to give a r-b for this patch?
> >> >
> >>
> >> Hi Ray,
> >>
> >> Could you please incorporate the feedback you received from Laszlo first?
> >> Thanks.
> >>
> >>
> >> >
> >> >> -----Original Message-----
> >> >> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf
> >> >> Of Ruiyu Ni
> >> >> Sent: Wednesday, November 29, 2017 9:00 AM
> >> >> To: edk2-devel@lists.01.org
> >> >> Cc: Laszlo Ersek <lersek@redhat.com>; Ard Biesheuvel
> >> >> <ard.biesheuvel@linaro.org>
> >> >> Subject: [edk2] [PATCH v3 3/6] ArmVirtPkg: Fix build failure due to
> >> >> Tftp library removal
> >> >>
> >> >> Contributed-under: TianoCore Contribution Agreement 1.1
> >> >> Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
> >> >> Cc: Laszlo Ersek <lersek@redhat.com>
> >> >> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> >> >> Cc: Julien Grall <julien.grall@linaro.org>
> >> >> ---
> >> >>  ArmVirtPkg/ArmVirt.dsc.inc           | 11 +++++++----
> >> >>  ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc |  3 ++-
> >> >>  ArmVirtPkg/ArmVirtXen.fdf            |  3 ++-
> >> >>  3 files changed, 11 insertions(+), 6 deletions(-)
> >> >>
> >> >> diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
> >> >> index 5d7edff104..9874637a3d 100644
> >> >> --- a/ArmVirtPkg/ArmVirt.dsc.inc
> >> >> +++ b/ArmVirtPkg/ArmVirt.dsc.inc
> >> >> @@ -1,7 +1,7 @@
> >> >>  #
> >> >>  #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
> >> >>  #  Copyright (c) 2014, Linaro Limited. All rights reserved.
> >> >> -#  Copyright (c) 2015, Intel Corporation. All rights reserved.
> >> >> +#  Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
> >> >>  #
> >> >>  #  This program and the accompanying materials  #  are licensed and
> >> >> made available under the terms and conditions of the BSD License @@
> >> >> -55,6 +55,8 @@ [LibraryClasses.common]
> >> >>    HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
> >> >>
> >> >>
> UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiSer
> >> >> UefiHiiServicesLib|vice
> >> >> sLib.inf
> >> >>    SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
> >> >> +  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
> >> >> +
> >> >> +
> FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.in
> >> >> + f
> >> >>
> >> >>    UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
> >> >>
> >> >>
> >>
> OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTree
> >> >> OrderedCollectionLib|L
> >> >> ib/BaseOrderedCollectionRedBlackTreeLib.inf
> >> >> @@ -217,8 +219,6 @@ [LibraryClasses.common.UEFI_APPLICATION]
> >> >>
> >> >>
> >>
> PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerforma
> >> >> nceLib.inf
> >> >>
> >> >>
> >>
> MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemo
> >> >> ryAllocationLib.inf
> >> >>    HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
> >> >> -  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
> >> >> -
> >> >> FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
> >> >>
> >> >>  [LibraryClasses.common.UEFI_DRIVER]
> >> >>
> >> >>
> >>
> UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCusto
> >> >> mDecompressLib/BaseUefiTianoCustomDecompressLib.inf
> >> >> @@ -383,6 +383,10 @@ [Components.common]
> >> >>    #
> >> >>    # UEFI application (Shell Embedded Boot Loader)
> >> >>    #
> >> >> +
> >> >>
> >>
> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.
> >> >> inf {
> >> >> +    <PcdsFixedAtBuild>
> >> >> +      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> >> >> +  }
> >> >>    ShellPkg/Application/Shell/Shell.inf {
> >> >>      <LibraryClasses>
> >> >>
> >> >>
> >>
> ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellComma
> >> >> ndLib.inf
> >> >> @@ -393,7 +397,6 @@ [Components.common]
> >> >>
> >> >>
> >>
> NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Com
> >> >> mandsLib.inf
> >> >>
> >> >>
> NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1C
> >> >> NULL|om
> >> >> mandsLib.inf
> >> >>
> >> >>
> >>
> NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1
> >> >> CommandsLib.inf
> >> >> -
> >> >>
> >>
> NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib
> >> >> .inf
> >> >>
> >> >>
> HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandlePars
> >> >> HandleParsingLib|ingL
> >> >> ib.inf
> >> >>        PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
> >> >>
> >> >>
> >>
> BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfg
> >> >> CommandLib.inf
> >> >> diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> >> >> b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> >> >> index 744006d13c..89f95b2d99 100644
> >> >> --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> >> >> +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> >> >> @@ -1,7 +1,7 @@
> >> >>  #
> >> >>  #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
> >> >>  #  Copyright (c) 2014-2016, Linaro Limited. All rights reserved.
> >> >> -#  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
> >> >> +#  Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
> >> >>  #
> >> >>  #  This program and the accompanying materials  #  are licensed and
> >> >> made available under the terms and conditions of the BSD License @@
> >> >> -103,6
> >> >> +103,7 @@ [FV.FvMain]
> >> >>    # UEFI application (Shell Embedded Boot Loader)
> >> >>    #
> >> >>    INF ShellPkg/Application/Shell/Shell.inf
> >> >> +  INF
> >> >>
> >>
> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.
> >> >> inf
> >> >>
> >> >>    #
> >> >>    # Bds
> >> >> diff --git a/ArmVirtPkg/ArmVirtXen.fdf b/ArmVirtPkg/ArmVirtXen.fdf
> >> >> index
> >> >> 70e76df228..6586ce6be5 100644
> >> >> --- a/ArmVirtPkg/ArmVirtXen.fdf
> >> >> +++ b/ArmVirtPkg/ArmVirtXen.fdf
> >> >> @@ -1,7 +1,7 @@
> >> >>  #
> >> >>  #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
> >> >>  #  Copyright (c) 2014, Linaro Limited. All rights reserved.
> >> >> -#  Copyright (c) 2015 - 2016, Intel Corporation. All rights
> >> >> reserved.<BR>
> >> >> +#  Copyright (c) 2015 - 2017, Intel Corporation. All rights
> >> >> +reserved.<BR>
> >> >>  #
> >> >>  #  This program and the accompanying materials  #  are licensed and
> >> >> made available under the terms and conditions of the BSD License @@
> >> >> -169,6
> >> >> +169,7 @@ [FV.FvMain]
> >> >>    # UEFI application (Shell Embedded Boot Loader)
> >> >>    #
> >> >>    INF ShellPkg/Application/Shell/Shell.inf
> >> >> +  INF
> >> >>
> >>
> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.
> >> >> inf
> >> >>
> >> >>    #
> >> >>    # Bds
> >> >> --
> >> >> 2.15.0.gvfs.1.preview.4
> >> >>
> >> >> _______________________________________________
> >> >> edk2-devel mailing list
> >> >> edk2-devel@lists.01.org
> >> >> https://lists.01.org/mailman/listinfo/edk2-devel

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PATCH v3 3/6] ArmVirtPkg: Fix build failure due to Tftp library removal
  2017-11-29 10:03           ` Ni, Ruiyu
@ 2017-11-29 10:05             ` Ard Biesheuvel
  0 siblings, 0 replies; 20+ messages in thread
From: Ard Biesheuvel @ 2017-11-29 10:05 UTC (permalink / raw)
  To: Ni, Ruiyu; +Cc: edk2-devel@lists.01.org, Laszlo Ersek

On 29 November 2017 at 10:03, Ni, Ruiyu <ruiyu.ni@intel.com> wrote:
> I see. Thanks.
> I will revise the commit message and send out in V4.
>
> BTW, which mail client are you using?

I use the Gmail web interface.

> All mails from lists.01.org are flatly shown in my Outlook, which is very hard
> to track.
>

Yes, it helps if you use a mail client that keeps the messages together.

-- 
Ard.


^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PATCH v3 3/6] ArmVirtPkg: Fix build failure due to Tftp library removal
  2017-11-29  0:59 ` [PATCH v3 3/6] ArmVirtPkg: " Ruiyu Ni
  2017-11-29  9:36   ` Ni, Ruiyu
@ 2017-11-29 11:06   ` Laszlo Ersek
  1 sibling, 0 replies; 20+ messages in thread
From: Laszlo Ersek @ 2017-11-29 11:06 UTC (permalink / raw)
  To: Ruiyu Ni, edk2-devel; +Cc: Ard Biesheuvel

On 11/29/17 01:59, Ruiyu Ni wrote:
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Julien Grall <julien.grall@linaro.org>
> ---
>  ArmVirtPkg/ArmVirt.dsc.inc           | 11 +++++++----
>  ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc |  3 ++-
>  ArmVirtPkg/ArmVirtXen.fdf            |  3 ++-
>  3 files changed, 11 insertions(+), 6 deletions(-)
> 
> diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
> index 5d7edff104..9874637a3d 100644
> --- a/ArmVirtPkg/ArmVirt.dsc.inc
> +++ b/ArmVirtPkg/ArmVirt.dsc.inc
> @@ -1,7 +1,7 @@
>  #
>  #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
>  #  Copyright (c) 2014, Linaro Limited. All rights reserved.
> -#  Copyright (c) 2015, Intel Corporation. All rights reserved.
> +#  Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
>  #
>  #  This program and the accompanying materials
>  #  are licensed and made available under the terms and conditions of the BSD License
> @@ -55,6 +55,8 @@ [LibraryClasses.common]
>    HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
>    UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
>    SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
> +  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
> +  FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
>  
>    UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
>    OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf
> @@ -217,8 +219,6 @@ [LibraryClasses.common.UEFI_APPLICATION]
>    PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
>    MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
>    HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
> -  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
> -  FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
>  
>  [LibraryClasses.common.UEFI_DRIVER]
>    UefiDecompressLib|IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTianoCustomDecompressLib.inf
> @@ -383,6 +383,10 @@ [Components.common]
>    #
>    # UEFI application (Shell Embedded Boot Loader)
>    #
> +  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
> +    <PcdsFixedAtBuild>
> +      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> +  }
>    ShellPkg/Application/Shell/Shell.inf {
>      <LibraryClasses>
>        ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
> @@ -393,7 +397,6 @@ [Components.common]
>        NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
>        NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
>        NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
> -      NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf
>        HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
>        PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
>        BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf
> diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> index 744006d13c..89f95b2d99 100644
> --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> @@ -1,7 +1,7 @@
>  #
>  #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
>  #  Copyright (c) 2014-2016, Linaro Limited. All rights reserved.
> -#  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
> +#  Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
>  #
>  #  This program and the accompanying materials
>  #  are licensed and made available under the terms and conditions of the BSD License
> @@ -103,6 +103,7 @@ [FV.FvMain]
>    # UEFI application (Shell Embedded Boot Loader)
>    #
>    INF ShellPkg/Application/Shell/Shell.inf
> +  INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
>  
>    #
>    # Bds
> diff --git a/ArmVirtPkg/ArmVirtXen.fdf b/ArmVirtPkg/ArmVirtXen.fdf
> index 70e76df228..6586ce6be5 100644
> --- a/ArmVirtPkg/ArmVirtXen.fdf
> +++ b/ArmVirtPkg/ArmVirtXen.fdf
> @@ -1,7 +1,7 @@
>  #
>  #  Copyright (c) 2011-2015, ARM Limited. All rights reserved.
>  #  Copyright (c) 2014, Linaro Limited. All rights reserved.
> -#  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
> +#  Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>
>  #
>  #  This program and the accompanying materials
>  #  are licensed and made available under the terms and conditions of the BSD License
> @@ -169,6 +169,7 @@ [FV.FvMain]
>    # UEFI application (Shell Embedded Boot Loader)
>    #
>    INF ShellPkg/Application/Shell/Shell.inf
> +  INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
>  
>    #
>    # Bds
> 

(1) Please update the commit message as I requested under v1:

http://mid.mail-archive.com/3fd3e63b-8734-3d74-d0ad-13f4e4a98be8@redhat.com

"The TFTP command was converted from a NULL class library instance to a
dynamic shell command in commit 0961002352e9".


(2) Please additionally mention in the commit message:

"The ShellLib and FileHandleLib resolutions are moved from
[LibraryClasses.common.UEFI_APPLICATION] to [LibraryClasses.common]
because dynamic shell commands are implemented as DXE_DRIVER modules."


(3) In the commit message, please additionally state,

"PcdShellLibAutoInitialize must be set to FALSE for both the shell app
itself and the dynamic shell command modules."


With these changes,

Reviewed-by: Laszlo Ersek <lersek@redhat.com>


Thanks
Laszlo


^ permalink raw reply	[flat|nested] 20+ messages in thread

* [PATCH v3 4/6] BeagleBoardPkg: Fix build failure due to Tftp library removal
  2017-11-29  0:59 [PATCH v3 0/6] Fix build failure due to tftp/dp library removal Ruiyu Ni
                   ` (2 preceding siblings ...)
  2017-11-29  0:59 ` [PATCH v3 3/6] ArmVirtPkg: " Ruiyu Ni
@ 2017-11-29  0:59 ` Ruiyu Ni
  2017-11-29  7:57   ` Ard Biesheuvel
  2017-11-29  0:59 ` [PATCH v3 5/6] CorebootPayloadPkg: Fix build failure due to Tftp/Dp " Ruiyu Ni
  2017-11-29  0:59 ` [PATCH v3 6/6] OvmfPkg: Add tftp dynamic command Ruiyu Ni
  5 siblings, 1 reply; 20+ messages in thread
From: Ruiyu Ni @ 2017-11-29  0:59 UTC (permalink / raw)
  To: edk2-devel; +Cc: Leif Lindholm, Ard Biesheuvel

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 BeagleBoardPkg/BeagleBoardPkg.dsc | 16 +++++++++-------
 BeagleBoardPkg/BeagleBoardPkg.fdf |  3 ++-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc
index 4f7c0bd645..d67ccf377e 100644
--- a/BeagleBoardPkg/BeagleBoardPkg.dsc
+++ b/BeagleBoardPkg/BeagleBoardPkg.dsc
@@ -2,7 +2,7 @@
 # Beagle board package.
 #
 # Copyright (c) 2009 - 2010, Apple Inc. All rights reserved.<BR>
-# Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>
 # Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
 #
 #    This program and the accompanying materials
@@ -355,11 +355,6 @@ [PcdsFixedAtBuild.common]
   # OMAP Interrupt Controller
   gEmbeddedTokenSpaceGuid.PcdInterruptBaseAddress|0x48200000
 
-  # We want to use the Shell Libraries but don't want it to initialise
-  # automatically. We initialise the libraries when the command is called by the
-  # Shell.
-  gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
-
   gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|10
 
   # GUID of the UEFI Shell
@@ -487,6 +482,14 @@ [Components.common]
       NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf
       NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf
   }
+
+  #
+  # Shell
+  #
+  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
+    <PcdsFixedAtBuild>
+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
+  }
   ShellPkg/Application/Shell/Shell.inf {
     <LibraryClasses>
       ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
@@ -497,7 +500,6 @@ [Components.common]
       NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
       NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
       NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
-      NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf
       HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
       PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
       BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf
diff --git a/BeagleBoardPkg/BeagleBoardPkg.fdf b/BeagleBoardPkg/BeagleBoardPkg.fdf
index c9c6afd714..71249c7eb3 100644
--- a/BeagleBoardPkg/BeagleBoardPkg.fdf
+++ b/BeagleBoardPkg/BeagleBoardPkg.fdf
@@ -1,7 +1,7 @@
 # FLASH layout file for Beagle board.
 #
 # Copyright (c) 2009, Apple Inc. All rights reserved.<BR>
-# Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>
 # Copyright (c) 2016, Linaro, Ltd. All rights reserved.<BR>
 #
 #    This program and the accompanying materials
@@ -178,6 +178,7 @@ [FV.FvMain]
   # UEFI application (Shell Embedded Boot Loader)
   #
   INF ShellPkg/Application/Shell/Shell.inf
+  INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 
   #
   # Bds
-- 
2.15.0.gvfs.1.preview.4



^ permalink raw reply related	[flat|nested] 20+ messages in thread

* Re: [PATCH v3 4/6] BeagleBoardPkg: Fix build failure due to Tftp library removal
  2017-11-29  0:59 ` [PATCH v3 4/6] BeagleBoardPkg: " Ruiyu Ni
@ 2017-11-29  7:57   ` Ard Biesheuvel
  2017-11-29  8:28     ` Ni, Ruiyu
  0 siblings, 1 reply; 20+ messages in thread
From: Ard Biesheuvel @ 2017-11-29  7:57 UTC (permalink / raw)
  To: Ruiyu Ni; +Cc: edk2-devel@lists.01.org, Leif Lindholm

On 29 November 2017 at 00:59, Ruiyu Ni <ruiyu.ni@intel.com> wrote:
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> ---
>  BeagleBoardPkg/BeagleBoardPkg.dsc | 16 +++++++++-------
>  BeagleBoardPkg/BeagleBoardPkg.fdf |  3 ++-
>  2 files changed, 11 insertions(+), 8 deletions(-)
>
> diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc
> index 4f7c0bd645..d67ccf377e 100644
> --- a/BeagleBoardPkg/BeagleBoardPkg.dsc
> +++ b/BeagleBoardPkg/BeagleBoardPkg.dsc
> @@ -2,7 +2,7 @@
>  # Beagle board package.
>  #
>  # Copyright (c) 2009 - 2010, Apple Inc. All rights reserved.<BR>
> -# Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>
>  # Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
>  #
>  #    This program and the accompanying materials
> @@ -355,11 +355,6 @@ [PcdsFixedAtBuild.common]
>    # OMAP Interrupt Controller
>    gEmbeddedTokenSpaceGuid.PcdInterruptBaseAddress|0x48200000
>
> -  # We want to use the Shell Libraries but don't want it to initialise
> -  # automatically. We initialise the libraries when the command is called by the
> -  # Shell.
> -  gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> -

Why are you moving this? The TFTP shell library is not the only user
of this PCD.

>    gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|10
>
>    # GUID of the UEFI Shell
> @@ -487,6 +482,14 @@ [Components.common]
>        NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf
>        NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf
>    }
> +
> +  #
> +  # Shell
> +  #
> +  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
> +    <PcdsFixedAtBuild>
> +      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> +  }
>    ShellPkg/Application/Shell/Shell.inf {
>      <LibraryClasses>
>        ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
> @@ -497,7 +500,6 @@ [Components.common]
>        NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
>        NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
>        NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
> -      NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf
>        HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
>        PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
>        BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf
> diff --git a/BeagleBoardPkg/BeagleBoardPkg.fdf b/BeagleBoardPkg/BeagleBoardPkg.fdf
> index c9c6afd714..71249c7eb3 100644
> --- a/BeagleBoardPkg/BeagleBoardPkg.fdf
> +++ b/BeagleBoardPkg/BeagleBoardPkg.fdf
> @@ -1,7 +1,7 @@
>  # FLASH layout file for Beagle board.
>  #
>  # Copyright (c) 2009, Apple Inc. All rights reserved.<BR>
> -# Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>
>  # Copyright (c) 2016, Linaro, Ltd. All rights reserved.<BR>
>  #
>  #    This program and the accompanying materials
> @@ -178,6 +178,7 @@ [FV.FvMain]
>    # UEFI application (Shell Embedded Boot Loader)
>    #
>    INF ShellPkg/Application/Shell/Shell.inf
> +  INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
>
>    #
>    # Bds
> --
> 2.15.0.gvfs.1.preview.4
>


^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PATCH v3 4/6] BeagleBoardPkg: Fix build failure due to Tftp library removal
  2017-11-29  7:57   ` Ard Biesheuvel
@ 2017-11-29  8:28     ` Ni, Ruiyu
  2017-11-29  8:40       ` Ard Biesheuvel
  0 siblings, 1 reply; 20+ messages in thread
From: Ni, Ruiyu @ 2017-11-29  8:28 UTC (permalink / raw)
  To: Ard Biesheuvel; +Cc: edk2-devel@lists.01.org, Leif Lindholm

Ard,
PcdShellLibAutoInitialize is specially set to FALSE in old code for Shell.efi build.
But in old code line 507, it is set FALSE for Shell.efi build.
So the global setting of this PCD can be removed.

Thanks/Ray

> -----Original Message-----
> From: Ard Biesheuvel [mailto:ard.biesheuvel@linaro.org]
> Sent: Wednesday, November 29, 2017 3:57 PM
> To: Ni, Ruiyu <ruiyu.ni@intel.com>
> Cc: edk2-devel@lists.01.org; Leif Lindholm <leif.lindholm@linaro.org>
> Subject: Re: [PATCH v3 4/6] BeagleBoardPkg: Fix build failure due to Tftp
> library removal
> 
> On 29 November 2017 at 00:59, Ruiyu Ni <ruiyu.ni@intel.com> wrote:
> > Contributed-under: TianoCore Contribution Agreement 1.1
> > Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
> > Cc: Leif Lindholm <leif.lindholm@linaro.org>
> > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > ---
> >  BeagleBoardPkg/BeagleBoardPkg.dsc | 16 +++++++++-------
> >  BeagleBoardPkg/BeagleBoardPkg.fdf |  3 ++-
> >  2 files changed, 11 insertions(+), 8 deletions(-)
> >
> > diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc
> b/BeagleBoardPkg/BeagleBoardPkg.dsc
> > index 4f7c0bd645..d67ccf377e 100644
> > --- a/BeagleBoardPkg/BeagleBoardPkg.dsc
> > +++ b/BeagleBoardPkg/BeagleBoardPkg.dsc
> > @@ -2,7 +2,7 @@
> >  # Beagle board package.
> >  #
> >  # Copyright (c) 2009 - 2010, Apple Inc. All rights reserved.<BR>
> > -# Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
> > +# Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>
> >  # Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
> >  #
> >  #    This program and the accompanying materials
> > @@ -355,11 +355,6 @@ [PcdsFixedAtBuild.common]
> >    # OMAP Interrupt Controller
> >    gEmbeddedTokenSpaceGuid.PcdInterruptBaseAddress|0x48200000
> >
> > -  # We want to use the Shell Libraries but don't want it to initialise
> > -  # automatically. We initialise the libraries when the command is called by
> the
> > -  # Shell.
> > -  gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> > -
> 
> Why are you moving this? The TFTP shell library is not the only user
> of this PCD.
> 
> >    gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|10
> >
> >    # GUID of the UEFI Shell
> > @@ -487,6 +482,14 @@ [Components.common]
> >
> NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf
> >
> NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMainte
> nanceManagerUiLib.inf
> >    }
> > +
> > +  #
> > +  # Shell
> > +  #
> > +
> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.
> inf {
> > +    <PcdsFixedAtBuild>
> > +      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> > +  }
> >    ShellPkg/Application/Shell/Shell.inf {
> >      <LibraryClasses>
> >
> ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellComma
> ndLib.inf
> > @@ -497,7 +500,6 @@ [Components.common]
> >
> NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Com
> mandsLib.inf
> >
> NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1Com
> mandsLib.inf
> >
> NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1
> CommandsLib.inf
> > -
> NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib
> .inf
> >
> HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingL
> ib.inf
> >        PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
> >
> BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfg
> CommandLib.inf
> > diff --git a/BeagleBoardPkg/BeagleBoardPkg.fdf
> b/BeagleBoardPkg/BeagleBoardPkg.fdf
> > index c9c6afd714..71249c7eb3 100644
> > --- a/BeagleBoardPkg/BeagleBoardPkg.fdf
> > +++ b/BeagleBoardPkg/BeagleBoardPkg.fdf
> > @@ -1,7 +1,7 @@
> >  # FLASH layout file for Beagle board.
> >  #
> >  # Copyright (c) 2009, Apple Inc. All rights reserved.<BR>
> > -# Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
> > +# Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>
> >  # Copyright (c) 2016, Linaro, Ltd. All rights reserved.<BR>
> >  #
> >  #    This program and the accompanying materials
> > @@ -178,6 +178,7 @@ [FV.FvMain]
> >    # UEFI application (Shell Embedded Boot Loader)
> >    #
> >    INF ShellPkg/Application/Shell/Shell.inf
> > +  INF
> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.
> inf
> >
> >    #
> >    # Bds
> > --
> > 2.15.0.gvfs.1.preview.4
> >

^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PATCH v3 4/6] BeagleBoardPkg: Fix build failure due to Tftp library removal
  2017-11-29  8:28     ` Ni, Ruiyu
@ 2017-11-29  8:40       ` Ard Biesheuvel
  0 siblings, 0 replies; 20+ messages in thread
From: Ard Biesheuvel @ 2017-11-29  8:40 UTC (permalink / raw)
  To: Ni, Ruiyu; +Cc: edk2-devel@lists.01.org, Leif Lindholm

On 29 November 2017 at 08:28, Ni, Ruiyu <ruiyu.ni@intel.com> wrote:
> Ard,
> PcdShellLibAutoInitialize is specially set to FALSE in old code for Shell.efi build.
> But in old code line 507, it is set FALSE for Shell.efi build.
> So the global setting of this PCD can be removed.
>

OK, fair enough.

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

> Thanks/Ray
>
>> -----Original Message-----
>> From: Ard Biesheuvel [mailto:ard.biesheuvel@linaro.org]
>> Sent: Wednesday, November 29, 2017 3:57 PM
>> To: Ni, Ruiyu <ruiyu.ni@intel.com>
>> Cc: edk2-devel@lists.01.org; Leif Lindholm <leif.lindholm@linaro.org>
>> Subject: Re: [PATCH v3 4/6] BeagleBoardPkg: Fix build failure due to Tftp
>> library removal
>>
>> On 29 November 2017 at 00:59, Ruiyu Ni <ruiyu.ni@intel.com> wrote:
>> > Contributed-under: TianoCore Contribution Agreement 1.1
>> > Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
>> > Cc: Leif Lindholm <leif.lindholm@linaro.org>
>> > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>> > ---
>> >  BeagleBoardPkg/BeagleBoardPkg.dsc | 16 +++++++++-------
>> >  BeagleBoardPkg/BeagleBoardPkg.fdf |  3 ++-
>> >  2 files changed, 11 insertions(+), 8 deletions(-)
>> >
>> > diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc
>> b/BeagleBoardPkg/BeagleBoardPkg.dsc
>> > index 4f7c0bd645..d67ccf377e 100644
>> > --- a/BeagleBoardPkg/BeagleBoardPkg.dsc
>> > +++ b/BeagleBoardPkg/BeagleBoardPkg.dsc
>> > @@ -2,7 +2,7 @@
>> >  # Beagle board package.
>> >  #
>> >  # Copyright (c) 2009 - 2010, Apple Inc. All rights reserved.<BR>
>> > -# Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
>> > +# Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>
>> >  # Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
>> >  #
>> >  #    This program and the accompanying materials
>> > @@ -355,11 +355,6 @@ [PcdsFixedAtBuild.common]
>> >    # OMAP Interrupt Controller
>> >    gEmbeddedTokenSpaceGuid.PcdInterruptBaseAddress|0x48200000
>> >
>> > -  # We want to use the Shell Libraries but don't want it to initialise
>> > -  # automatically. We initialise the libraries when the command is called by
>> the
>> > -  # Shell.
>> > -  gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
>> > -
>>
>> Why are you moving this? The TFTP shell library is not the only user
>> of this PCD.
>>
>> >    gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|10
>> >
>> >    # GUID of the UEFI Shell
>> > @@ -487,6 +482,14 @@ [Components.common]
>> >
>> NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf
>> >
>> NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMainte
>> nanceManagerUiLib.inf
>> >    }
>> > +
>> > +  #
>> > +  # Shell
>> > +  #
>> > +
>> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.
>> inf {
>> > +    <PcdsFixedAtBuild>
>> > +      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
>> > +  }
>> >    ShellPkg/Application/Shell/Shell.inf {
>> >      <LibraryClasses>
>> >
>> ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellComma
>> ndLib.inf
>> > @@ -497,7 +500,6 @@ [Components.common]
>> >
>> NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Com
>> mandsLib.inf
>> >
>> NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1Com
>> mandsLib.inf
>> >
>> NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1
>> CommandsLib.inf
>> > -
>> NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib
>> .inf
>> >
>> HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingL
>> ib.inf
>> >        PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
>> >
>> BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfg
>> CommandLib.inf
>> > diff --git a/BeagleBoardPkg/BeagleBoardPkg.fdf
>> b/BeagleBoardPkg/BeagleBoardPkg.fdf
>> > index c9c6afd714..71249c7eb3 100644
>> > --- a/BeagleBoardPkg/BeagleBoardPkg.fdf
>> > +++ b/BeagleBoardPkg/BeagleBoardPkg.fdf
>> > @@ -1,7 +1,7 @@
>> >  # FLASH layout file for Beagle board.
>> >  #
>> >  # Copyright (c) 2009, Apple Inc. All rights reserved.<BR>
>> > -# Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
>> > +# Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>
>> >  # Copyright (c) 2016, Linaro, Ltd. All rights reserved.<BR>
>> >  #
>> >  #    This program and the accompanying materials
>> > @@ -178,6 +178,7 @@ [FV.FvMain]
>> >    # UEFI application (Shell Embedded Boot Loader)
>> >    #
>> >    INF ShellPkg/Application/Shell/Shell.inf
>> > +  INF
>> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.
>> inf
>> >
>> >    #
>> >    # Bds
>> > --
>> > 2.15.0.gvfs.1.preview.4
>> >


^ permalink raw reply	[flat|nested] 20+ messages in thread

* [PATCH v3 5/6] CorebootPayloadPkg: Fix build failure due to Tftp/Dp library removal
  2017-11-29  0:59 [PATCH v3 0/6] Fix build failure due to tftp/dp library removal Ruiyu Ni
                   ` (3 preceding siblings ...)
  2017-11-29  0:59 ` [PATCH v3 4/6] BeagleBoardPkg: " Ruiyu Ni
@ 2017-11-29  0:59 ` Ruiyu Ni
  2017-11-29  1:51   ` You, Benjamin
  2017-11-29  0:59 ` [PATCH v3 6/6] OvmfPkg: Add tftp dynamic command Ruiyu Ni
  5 siblings, 1 reply; 20+ messages in thread
From: Ruiyu Ni @ 2017-11-29  0:59 UTC (permalink / raw)
  To: edk2-devel; +Cc: Maurice Ma, Prince Agyeman, Benjamin You

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Maurice Ma <maurice.ma@intel.com>
Cc: Prince Agyeman <prince.agyeman@intel.com>
Cc: Benjamin You <benjamin.you@intel.com>
---
 CorebootPayloadPkg/CorebootPayloadPkg.fdf        |  4 ++-
 CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc    | 36 +++++++++++++-----------
 CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc | 36 +++++++++++++-----------
 3 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/CorebootPayloadPkg/CorebootPayloadPkg.fdf b/CorebootPayloadPkg/CorebootPayloadPkg.fdf
index 303e626842..7994f0c949 100644
--- a/CorebootPayloadPkg/CorebootPayloadPkg.fdf
+++ b/CorebootPayloadPkg/CorebootPayloadPkg.fdf
@@ -3,7 +3,7 @@
 #
 # Provides drivers and definitions to create uefi payload for coreboot.
 #
-# Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>
 # This program and the accompanying materials are licensed and made available under
 # the terms and conditions of the BSD License that accompanies this distribution.
 # The full text of the license may be found at
@@ -180,6 +180,8 @@ [FV.DXEFV]
 # Shell
 #
 !if $(SHELL_TYPE) == BUILD_SHELL
+INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
+INF ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf
 INF ShellPkg/Application/Shell/Shell.inf
 !endif
 
diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
index cdfcb75b59..ace1bc0a37 100644
--- a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
+++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
@@ -3,7 +3,7 @@
 #
 # Provides drivers and definitions to create uefi payload for coreboot.
 #
-# Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>
 # This program and the accompanying materials are licensed and made available under
 # the terms and conditions of the BSD License that accompanies this distribution.
 # The full text of the license may be found at
@@ -515,11 +515,6 @@ [Components.IA32]
 
 !if $(SHELL_TYPE) == BUILD_SHELL
 
-[PcdsFixedAtBuild]
-  ## This flag is used to control initialization of the shell library
-  #  This should be FALSE for compiling the shell application itself only.
-  gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
-
   #
   # Shell Lib
   #
@@ -527,9 +522,27 @@ [LibraryClasses]
   BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf
   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
+  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
+  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
 
 [Components.IA32]
+  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
+    <PcdsFixedAtBuild>
+      ## This flag is used to control initialization of the shell library
+      #  This should be FALSE for compiling the dynamic command.
+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
+  }
+  ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf {
+    <PcdsFixedAtBuild>
+      ## This flag is used to control initialization of the shell library
+      #  This should be FALSE for compiling the dynamic command.
+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
+  }
   ShellPkg/Application/Shell/Shell.inf {
+    <PcdsFixedAtBuild>
+      ## This flag is used to control initialization of the shell library
+      #  This should be FALSE for compiling the shell application itself only.
+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
 
     #------------------------------
     #  Basic commands
@@ -549,14 +562,6 @@ [Components.IA32]
 
     <LibraryClasses>
       NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
-      NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf
-
-    #------------------------------
-    #  Performance command
-    #------------------------------
-
-    <LibraryClasses>
-      NULL|ShellPkg/Library/UefiDpLib/UefiDpLib.inf
 
     #------------------------------
     #  Support libraries
@@ -565,13 +570,10 @@ [Components.IA32]
     <LibraryClasses>
       DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf
       DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
-      FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
       HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
-      NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
       PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
       ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
       ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
-      ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
       SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
   }
 
diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
index 6b16af63ba..2492142b97 100644
--- a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
+++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
@@ -3,7 +3,7 @@
 #
 # Provides drivers and definitions to create uefi payload for coreboot.
 #
-# Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>
 # This program and the accompanying materials are licensed and made available under
 # the terms and conditions of the BSD License that accompanies this distribution.
 # The full text of the license may be found at
@@ -516,11 +516,6 @@ [Components.X64]
 
 !if $(SHELL_TYPE) == BUILD_SHELL
 
-[PcdsFixedAtBuild]
-  ## This flag is used to control initialization of the shell library
-  #  This should be FALSE for compiling the shell application itself only.
-  gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
-
   #
   # Shell Lib
   #
@@ -528,9 +523,27 @@ [LibraryClasses]
   BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf
   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
+  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
+  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
 
 [Components.X64]
+  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
+    <PcdsFixedAtBuild>
+      ## This flag is used to control initialization of the shell library
+      #  This should be FALSE for compiling the dynamic command.
+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
+  }
+  ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf {
+    <PcdsFixedAtBuild>
+      ## This flag is used to control initialization of the shell library
+      #  This should be FALSE for compiling the dynamic command.
+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
+  }
   ShellPkg/Application/Shell/Shell.inf {
+    <PcdsFixedAtBuild>
+      ## This flag is used to control initialization of the shell library
+      #  This should be FALSE for compiling the shell application itself only.
+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
 
     #------------------------------
     #  Basic commands
@@ -550,14 +563,6 @@ [Components.X64]
 
     <LibraryClasses>
       NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
-      NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf
-
-    #------------------------------
-    #  Performance command
-    #------------------------------
-
-    <LibraryClasses>
-      NULL|ShellPkg/Library/UefiDpLib/UefiDpLib.inf
 
     #------------------------------
     #  Support libraries
@@ -566,13 +571,10 @@ [Components.X64]
     <LibraryClasses>
       DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf
       DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
-      FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
       HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
-      NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
       PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
       ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
       ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
-      ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
       SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
   }
 
-- 
2.15.0.gvfs.1.preview.4



^ permalink raw reply related	[flat|nested] 20+ messages in thread

* Re: [PATCH v3 5/6] CorebootPayloadPkg: Fix build failure due to Tftp/Dp library removal
  2017-11-29  0:59 ` [PATCH v3 5/6] CorebootPayloadPkg: Fix build failure due to Tftp/Dp " Ruiyu Ni
@ 2017-11-29  1:51   ` You, Benjamin
  0 siblings, 0 replies; 20+ messages in thread
From: You, Benjamin @ 2017-11-29  1:51 UTC (permalink / raw)
  To: Ni, Ruiyu, edk2-devel@lists.01.org; +Cc: Ma, Maurice, Agyeman, Prince

Reviewed-by: Benjamin You <benjamin.you@intel.com>

> -----Original Message-----
> From: Ni, Ruiyu
> Sent: Wednesday, November 29, 2017 9:00 AM
> To: edk2-devel@lists.01.org
> Cc: Ma, Maurice <maurice.ma@intel.com>; Agyeman, Prince
> <prince.agyeman@intel.com>; You, Benjamin <benjamin.you@intel.com>
> Subject: [PATCH v3 5/6] CorebootPayloadPkg: Fix build failure due to Tftp/Dp
> library removal
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Maurice Ma <maurice.ma@intel.com>
> Cc: Prince Agyeman <prince.agyeman@intel.com>
> Cc: Benjamin You <benjamin.you@intel.com>
> ---
>  CorebootPayloadPkg/CorebootPayloadPkg.fdf        |  4 ++-
>  CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc    | 36 +++++++++++++------
> -----
>  CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc | 36 +++++++++++++----
> -------
>  3 files changed, 41 insertions(+), 35 deletions(-)
> 
> diff --git a/CorebootPayloadPkg/CorebootPayloadPkg.fdf
> b/CorebootPayloadPkg/CorebootPayloadPkg.fdf
> index 303e626842..7994f0c949 100644
> --- a/CorebootPayloadPkg/CorebootPayloadPkg.fdf
> +++ b/CorebootPayloadPkg/CorebootPayloadPkg.fdf
> @@ -3,7 +3,7 @@
>  #
>  # Provides drivers and definitions to create uefi payload for coreboot.
>  #
> -# Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>
>  # This program and the accompanying materials are licensed and made
> available under
>  # the terms and conditions of the BSD License that accompanies this distribution.
>  # The full text of the license may be found at
> @@ -180,6 +180,8 @@ [FV.DXEFV]
>  # Shell
>  #
>  !if $(SHELL_TYPE) == BUILD_SHELL
> +INF
> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
> +INF
> ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf
>  INF ShellPkg/Application/Shell/Shell.inf
>  !endif
> 
> diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
> b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
> index cdfcb75b59..ace1bc0a37 100644
> --- a/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
> +++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32.dsc
> @@ -3,7 +3,7 @@
>  #
>  # Provides drivers and definitions to create uefi payload for coreboot.
>  #
> -# Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>
>  # This program and the accompanying materials are licensed and made
> available under
>  # the terms and conditions of the BSD License that accompanies this distribution.
>  # The full text of the license may be found at
> @@ -515,11 +515,6 @@ [Components.IA32]
> 
>  !if $(SHELL_TYPE) == BUILD_SHELL
> 
> -[PcdsFixedAtBuild]
> -  ## This flag is used to control initialization of the shell library
> -  #  This should be FALSE for compiling the shell application itself only.
> -  gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> -
>    #
>    # Shell Lib
>    #
> @@ -527,9 +522,27 @@ [LibraryClasses]
> 
> BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCo
> mmandLib.inf
>    DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
>    FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
> +  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
> +  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
> 
>  [Components.IA32]
> +
> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
> {
> +    <PcdsFixedAtBuild>
> +      ## This flag is used to control initialization of the shell library
> +      #  This should be FALSE for compiling the dynamic command.
> +      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> +  }
> +  ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf {
> +    <PcdsFixedAtBuild>
> +      ## This flag is used to control initialization of the shell library
> +      #  This should be FALSE for compiling the dynamic command.
> +      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> +  }
>    ShellPkg/Application/Shell/Shell.inf {
> +    <PcdsFixedAtBuild>
> +      ## This flag is used to control initialization of the shell library
> +      #  This should be FALSE for compiling the shell application itself only.
> +      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> 
>      #------------------------------
>      #  Basic commands
> @@ -549,14 +562,6 @@ [Components.IA32]
> 
>      <LibraryClasses>
> 
> NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1Co
> mmandsLib.inf
> -
> NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf
> -
> -    #------------------------------
> -    #  Performance command
> -    #------------------------------
> -
> -    <LibraryClasses>
> -      NULL|ShellPkg/Library/UefiDpLib/UefiDpLib.inf
> 
>      #------------------------------
>      #  Support libraries
> @@ -565,13 +570,10 @@ [Components.IA32]
>      <LibraryClasses>
>        DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf
>        DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
> -      FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
> 
> HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.i
> nf
> -      NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
>        PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
>        ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
> 
> ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLi
> b.inf
> -      ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
>        SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
>    }
> 
> diff --git a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
> b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
> index 6b16af63ba..2492142b97 100644
> --- a/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
> +++ b/CorebootPayloadPkg/CorebootPayloadPkgIa32X64.dsc
> @@ -3,7 +3,7 @@
>  #
>  # Provides drivers and definitions to create uefi payload for coreboot.
>  #
> -# Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>
>  # This program and the accompanying materials are licensed and made
> available under
>  # the terms and conditions of the BSD License that accompanies this distribution.
>  # The full text of the license may be found at
> @@ -516,11 +516,6 @@ [Components.X64]
> 
>  !if $(SHELL_TYPE) == BUILD_SHELL
> 
> -[PcdsFixedAtBuild]
> -  ## This flag is used to control initialization of the shell library
> -  #  This should be FALSE for compiling the shell application itself only.
> -  gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> -
>    #
>    # Shell Lib
>    #
> @@ -528,9 +523,27 @@ [LibraryClasses]
> 
> BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCo
> mmandLib.inf
>    DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
>    FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
> +  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
> +  NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
> 
>  [Components.X64]
> +
> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
> {
> +    <PcdsFixedAtBuild>
> +      ## This flag is used to control initialization of the shell library
> +      #  This should be FALSE for compiling the dynamic command.
> +      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> +  }
> +  ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf {
> +    <PcdsFixedAtBuild>
> +      ## This flag is used to control initialization of the shell library
> +      #  This should be FALSE for compiling the dynamic command.
> +      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> +  }
>    ShellPkg/Application/Shell/Shell.inf {
> +    <PcdsFixedAtBuild>
> +      ## This flag is used to control initialization of the shell library
> +      #  This should be FALSE for compiling the shell application itself only.
> +      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> 
>      #------------------------------
>      #  Basic commands
> @@ -550,14 +563,6 @@ [Components.X64]
> 
>      <LibraryClasses>
> 
> NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1Co
> mmandsLib.inf
> -
> NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf
> -
> -    #------------------------------
> -    #  Performance command
> -    #------------------------------
> -
> -    <LibraryClasses>
> -      NULL|ShellPkg/Library/UefiDpLib/UefiDpLib.inf
> 
>      #------------------------------
>      #  Support libraries
> @@ -566,13 +571,10 @@ [Components.X64]
>      <LibraryClasses>
>        DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf
>        DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
> -      FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
> 
> HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.i
> nf
> -      NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
>        PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
>        ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf
> 
> ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLi
> b.inf
> -      ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
>        SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
>    }
> 
> --
> 2.15.0.gvfs.1.preview.4



^ permalink raw reply	[flat|nested] 20+ messages in thread

* [PATCH v3 6/6] OvmfPkg: Add tftp dynamic command
  2017-11-29  0:59 [PATCH v3 0/6] Fix build failure due to tftp/dp library removal Ruiyu Ni
                   ` (4 preceding siblings ...)
  2017-11-29  0:59 ` [PATCH v3 5/6] CorebootPayloadPkg: Fix build failure due to Tftp/Dp " Ruiyu Ni
@ 2017-11-29  0:59 ` Ruiyu Ni
  2017-11-29 10:53   ` Laszlo Ersek
  5 siblings, 1 reply; 20+ messages in thread
From: Ruiyu Ni @ 2017-11-29  0:59 UTC (permalink / raw)
  To: edk2-devel; +Cc: Jordan Justen, Ard Biesheuvel, Anthony Perard, Julien Grall

The TFTP command was converted from a NULL class library instance
to a dynamic shell command in commit 0961002352e9.
This patch complements commit f9bc2f876326, which only removed the
old library, but didn't add the new dynamic command。

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Anthony Perard <anthony.perard@citrix.com>
Cc: Julien Grall <julien.grall@linaro.org>
---
 OvmfPkg/OvmfPkgIa32.dsc    | 7 +++++--
 OvmfPkg/OvmfPkgIa32.fdf    | 3 ++-
 OvmfPkg/OvmfPkgIa32X64.dsc | 7 +++++--
 OvmfPkg/OvmfPkgIa32X64.fdf | 3 ++-
 OvmfPkg/OvmfPkgX64.dsc     | 7 +++++--
 OvmfPkg/OvmfPkgX64.fdf     | 3 ++-
 6 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index 19fa0b4c8d..9d23f8c162 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -193,6 +193,7 @@ [LibraryClasses]
   TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
 !endif
 
+  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
   S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf
   SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf
   OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf
@@ -783,6 +784,10 @@ [Components]
 !endif
 
 !ifndef $(USE_OLD_SHELL)
+  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
+    <PcdsFixedAtBuild>
+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
+  }
   ShellPkg/Application/Shell/Shell.inf {
     <LibraryClasses>
       ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
@@ -797,8 +802,6 @@ [Components]
       NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf
 !endif
       HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
-      ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
-      FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
       PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
 #      SafeBlockIoLib|ShellPkg/Library/SafeBlockIoLib/SafeBlockIoLib.inf
 #      SafeOpenProtocolLib|ShellPkg/Library/SafeOpenProtocolLib/SafeOpenProtocolLib.inf
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
index 06a439f8cb..ba980834d7 100644
--- a/OvmfPkg/OvmfPkgIa32.fdf
+++ b/OvmfPkg/OvmfPkgIa32.fdf
@@ -1,7 +1,7 @@
 ## @file
 #  Open Virtual Machine Firmware: FDF
 #
-#  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
 #  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
 #
 #  This program and the accompanying materials
@@ -285,6 +285,7 @@ [FV.DXEFV]
 INF  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
 
 !ifndef $(USE_OLD_SHELL)
+INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 INF  ShellPkg/Application/Shell/Shell.inf
 !else
 INF  RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index e1555dbfa8..a9c667fed8 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -198,6 +198,7 @@ [LibraryClasses]
   TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
 !endif
 
+  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
   S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf
   SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf
   OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf
@@ -792,6 +793,10 @@ [Components.X64]
 !endif
 
 !ifndef $(USE_OLD_SHELL)
+  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
+    <PcdsFixedAtBuild>
+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
+  }
   ShellPkg/Application/Shell/Shell.inf {
     <LibraryClasses>
       ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
@@ -806,8 +811,6 @@ [Components.X64]
       NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf
 !endif
       HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
-      ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
-      FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
       PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
 #      SafeBlockIoLib|ShellPkg/Library/SafeBlockIoLib/SafeBlockIoLib.inf
 #      SafeOpenProtocolLib|ShellPkg/Library/SafeOpenProtocolLib/SafeOpenProtocolLib.inf
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index ced4c5639f..72ac82e76b 100644
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -1,7 +1,7 @@
 ## @file
 #  Open Virtual Machine Firmware: FDF
 #
-#  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
 #  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
 #
 #  This program and the accompanying materials
@@ -286,6 +286,7 @@ [FV.DXEFV]
 INF  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
 
 !ifndef $(USE_OLD_SHELL)
+INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 INF  ShellPkg/Application/Shell/Shell.inf
 !else
 INF  RuleOverride = BINARY USE = X64 EdkShellBinPkg/FullShell/FullShell.inf
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index 83d63e55d7..abf570512a 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -198,6 +198,7 @@ [LibraryClasses]
   TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
 !endif
 
+  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
   S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf
   SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf
   OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf
@@ -790,6 +791,10 @@ [Components]
 !endif
 
 !ifndef $(USE_OLD_SHELL)
+  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
+    <PcdsFixedAtBuild>
+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
+  }
   ShellPkg/Application/Shell/Shell.inf {
     <LibraryClasses>
       ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
@@ -804,8 +809,6 @@ [Components]
       NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf
 !endif
       HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
-      ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
-      FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
       PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
 #      SafeBlockIoLib|ShellPkg/Library/SafeBlockIoLib/SafeBlockIoLib.inf
 #      SafeOpenProtocolLib|ShellPkg/Library/SafeOpenProtocolLib/SafeOpenProtocolLib.inf
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index 62dd58f6e4..2fc17810eb 100644
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -1,7 +1,7 @@
 ## @file
 #  Open Virtual Machine Firmware: FDF
 #
-#  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
 #  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
 #
 #  This program and the accompanying materials
@@ -286,6 +286,7 @@ [FV.DXEFV]
 INF  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
 
 !ifndef $(USE_OLD_SHELL)
+INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
 INF  ShellPkg/Application/Shell/Shell.inf
 !else
 INF  RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf
-- 
2.15.0.gvfs.1.preview.4



^ permalink raw reply related	[flat|nested] 20+ messages in thread

* Re: [PATCH v3 6/6] OvmfPkg: Add tftp dynamic command
  2017-11-29  0:59 ` [PATCH v3 6/6] OvmfPkg: Add tftp dynamic command Ruiyu Ni
@ 2017-11-29 10:53   ` Laszlo Ersek
  2017-11-29 13:12     ` Ni, Ruiyu
  0 siblings, 1 reply; 20+ messages in thread
From: Laszlo Ersek @ 2017-11-29 10:53 UTC (permalink / raw)
  To: Ruiyu Ni, edk2-devel
  Cc: Anthony Perard, Jordan Justen, Ard Biesheuvel, Carsey, Jaben

Hi Ray,

On 11/29/17 01:59, Ruiyu Ni wrote:
> The TFTP command was converted from a NULL class library instance
> to a dynamic shell command in commit 0961002352e9.
> This patch complements commit f9bc2f876326, which only removed the
> old library, but didn't add the new dynamic command。
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Anthony Perard <anthony.perard@citrix.com>
> Cc: Julien Grall <julien.grall@linaro.org>
> ---
>  OvmfPkg/OvmfPkgIa32.dsc    | 7 +++++--
>  OvmfPkg/OvmfPkgIa32.fdf    | 3 ++-
>  OvmfPkg/OvmfPkgIa32X64.dsc | 7 +++++--
>  OvmfPkg/OvmfPkgIa32X64.fdf | 3 ++-
>  OvmfPkg/OvmfPkgX64.dsc     | 7 +++++--
>  OvmfPkg/OvmfPkgX64.fdf     | 3 ++-
>  6 files changed, 21 insertions(+), 9 deletions(-)

after v1 I asked for some changes, and gave my R-b conditional on those
changes:

http://mid.mail-archive.com/fe382f8c-0c1a-f66c-cbba-a18a7ed37aaa@redhat.com

The v2 and v3 versions of the same patch contain code that were (a) not
present in v1 and (b) not requested by me after v1. So, I could not have
seen that code or commented on it. I don't think my R-b from v1 should
have been carried forward to v3, and then used as the basis for pushing
the v3 patch as 984ba6a46747.

The commit message doesn't say anything about PcdShellLibAutoInitialize,
and about the removal of the FileHandleLib resolution.

The removal of the FileHandleLib resolution under Shell.inf was
justified, of course (because it was a duplicate / unnecessary
resolution), but it should have been broken out to a separate patch, or
at least mentioned in the commit message.

Also I can find PcdShellLibAutoInitialize in "ShellPkg.dec",

  ## This flag is used to control initialization of the shell library
  #  This should be FALSE for compiling the shell application itself only.

but quoting it in the commit message is helpful. The general idea is to
spend a bit more time on patch creation so that review is faster/easier
(there could be multiple reviewers, and in the future the commit could
be consulted several times).

In fact, given how "PcdShellLibAutoInitialize" is now used in the OVMF
DSC files, I would say that the description in "ShellPkg.dec" is now out
of date. The documentation should say that the PCD should be FALSE for
the shell application itself, *plus* DXE_DRIVER modules that implement
dynamic shell commands.


I'm doing my best to be responsive; please give me a chance to comment
on OvmfPkg changes that I've never seen or requested.

Thanks
Laszlo

> diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
> index 19fa0b4c8d..9d23f8c162 100644
> --- a/OvmfPkg/OvmfPkgIa32.dsc
> +++ b/OvmfPkg/OvmfPkgIa32.dsc
> @@ -193,6 +193,7 @@ [LibraryClasses]
>    TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
>  !endif
>  
> +  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
>    S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf
>    SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf
>    OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf
> @@ -783,6 +784,10 @@ [Components]
>  !endif
>  
>  !ifndef $(USE_OLD_SHELL)
> +  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
> +    <PcdsFixedAtBuild>
> +      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> +  }
>    ShellPkg/Application/Shell/Shell.inf {
>      <LibraryClasses>
>        ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
> @@ -797,8 +802,6 @@ [Components]
>        NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf
>  !endif
>        HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
> -      ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
> -      FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
>        PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
>  #      SafeBlockIoLib|ShellPkg/Library/SafeBlockIoLib/SafeBlockIoLib.inf
>  #      SafeOpenProtocolLib|ShellPkg/Library/SafeOpenProtocolLib/SafeOpenProtocolLib.inf
> diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
> index 06a439f8cb..ba980834d7 100644
> --- a/OvmfPkg/OvmfPkgIa32.fdf
> +++ b/OvmfPkg/OvmfPkgIa32.fdf
> @@ -1,7 +1,7 @@
>  ## @file
>  #  Open Virtual Machine Firmware: FDF
>  #
> -#  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
> +#  Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
>  #  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
>  #
>  #  This program and the accompanying materials
> @@ -285,6 +285,7 @@ [FV.DXEFV]
>  INF  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
>  
>  !ifndef $(USE_OLD_SHELL)
> +INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
>  INF  ShellPkg/Application/Shell/Shell.inf
>  !else
>  INF  RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf
> diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
> index e1555dbfa8..a9c667fed8 100644
> --- a/OvmfPkg/OvmfPkgIa32X64.dsc
> +++ b/OvmfPkg/OvmfPkgIa32X64.dsc
> @@ -198,6 +198,7 @@ [LibraryClasses]
>    TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
>  !endif
>  
> +  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
>    S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf
>    SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf
>    OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf
> @@ -792,6 +793,10 @@ [Components.X64]
>  !endif
>  
>  !ifndef $(USE_OLD_SHELL)
> +  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
> +    <PcdsFixedAtBuild>
> +      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> +  }
>    ShellPkg/Application/Shell/Shell.inf {
>      <LibraryClasses>
>        ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
> @@ -806,8 +811,6 @@ [Components.X64]
>        NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf
>  !endif
>        HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
> -      ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
> -      FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
>        PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
>  #      SafeBlockIoLib|ShellPkg/Library/SafeBlockIoLib/SafeBlockIoLib.inf
>  #      SafeOpenProtocolLib|ShellPkg/Library/SafeOpenProtocolLib/SafeOpenProtocolLib.inf
> diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
> index ced4c5639f..72ac82e76b 100644
> --- a/OvmfPkg/OvmfPkgIa32X64.fdf
> +++ b/OvmfPkg/OvmfPkgIa32X64.fdf
> @@ -1,7 +1,7 @@
>  ## @file
>  #  Open Virtual Machine Firmware: FDF
>  #
> -#  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
> +#  Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
>  #  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
>  #
>  #  This program and the accompanying materials
> @@ -286,6 +286,7 @@ [FV.DXEFV]
>  INF  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
>  
>  !ifndef $(USE_OLD_SHELL)
> +INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
>  INF  ShellPkg/Application/Shell/Shell.inf
>  !else
>  INF  RuleOverride = BINARY USE = X64 EdkShellBinPkg/FullShell/FullShell.inf
> diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
> index 83d63e55d7..abf570512a 100644
> --- a/OvmfPkg/OvmfPkgX64.dsc
> +++ b/OvmfPkg/OvmfPkgX64.dsc
> @@ -198,6 +198,7 @@ [LibraryClasses]
>    TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
>  !endif
>  
> +  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
>    S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf
>    SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf
>    OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf
> @@ -790,6 +791,10 @@ [Components]
>  !endif
>  
>  !ifndef $(USE_OLD_SHELL)
> +  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
> +    <PcdsFixedAtBuild>
> +      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> +  }
>    ShellPkg/Application/Shell/Shell.inf {
>      <LibraryClasses>
>        ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
> @@ -804,8 +809,6 @@ [Components]
>        NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf
>  !endif
>        HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
> -      ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
> -      FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
>        PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
>  #      SafeBlockIoLib|ShellPkg/Library/SafeBlockIoLib/SafeBlockIoLib.inf
>  #      SafeOpenProtocolLib|ShellPkg/Library/SafeOpenProtocolLib/SafeOpenProtocolLib.inf
> diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
> index 62dd58f6e4..2fc17810eb 100644
> --- a/OvmfPkg/OvmfPkgX64.fdf
> +++ b/OvmfPkg/OvmfPkgX64.fdf
> @@ -1,7 +1,7 @@
>  ## @file
>  #  Open Virtual Machine Firmware: FDF
>  #
> -#  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
> +#  Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
>  #  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
>  #
>  #  This program and the accompanying materials
> @@ -286,6 +286,7 @@ [FV.DXEFV]
>  INF  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
>  
>  !ifndef $(USE_OLD_SHELL)
> +INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
>  INF  ShellPkg/Application/Shell/Shell.inf
>  !else
>  INF  RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf
> 



^ permalink raw reply	[flat|nested] 20+ messages in thread

* Re: [PATCH v3 6/6] OvmfPkg: Add tftp dynamic command
  2017-11-29 10:53   ` Laszlo Ersek
@ 2017-11-29 13:12     ` Ni, Ruiyu
  0 siblings, 0 replies; 20+ messages in thread
From: Ni, Ruiyu @ 2017-11-29 13:12 UTC (permalink / raw)
  To: Laszlo Ersek, edk2-devel@lists.01.org
  Cc: Anthony Perard, Justen, Jordan L, Ard Biesheuvel, Carsey, Jaben



> -----Original Message-----
> From: Laszlo Ersek [mailto:lersek@redhat.com]
> Sent: Wednesday, November 29, 2017 6:54 PM
> To: Ni, Ruiyu <ruiyu.ni@intel.com>; edk2-devel@lists.01.org
> Cc: Anthony Perard <anthony.perard@citrix.com>; Justen, Jordan L
> <jordan.l.justen@intel.com>; Ard Biesheuvel <ard.biesheuvel@linaro.org>;
> Carsey, Jaben <jaben.carsey@intel.com>
> Subject: Re: [edk2] [PATCH v3 6/6] OvmfPkg: Add tftp dynamic command
> 
> Hi Ray,
> 
> On 11/29/17 01:59, Ruiyu Ni wrote:
> > The TFTP command was converted from a NULL class library instance
> > to a dynamic shell command in commit 0961002352e9.
> > This patch complements commit f9bc2f876326, which only removed the
> > old library, but didn't add the new dynamic command。
> >
> > Contributed-under: TianoCore Contribution Agreement 1.1
> > Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
> > Cc: Jordan Justen <jordan.l.justen@intel.com>
> > Reviewed-by: Laszlo Ersek <lersek@redhat.com>
> > Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > Cc: Anthony Perard <anthony.perard@citrix.com>
> > Cc: Julien Grall <julien.grall@linaro.org>
> > ---
> >  OvmfPkg/OvmfPkgIa32.dsc    | 7 +++++--
> >  OvmfPkg/OvmfPkgIa32.fdf    | 3 ++-
> >  OvmfPkg/OvmfPkgIa32X64.dsc | 7 +++++--
> >  OvmfPkg/OvmfPkgIa32X64.fdf | 3 ++-
> >  OvmfPkg/OvmfPkgX64.dsc     | 7 +++++--
> >  OvmfPkg/OvmfPkgX64.fdf     | 3 ++-
> >  6 files changed, 21 insertions(+), 9 deletions(-)
> 
> after v1 I asked for some changes, and gave my R-b conditional on those
> changes:
> 
> http://mid.mail-archive.com/fe382f8c-0c1a-f66c-cbba-
> a18a7ed37aaa@redhat.com
> 
> The v2 and v3 versions of the same patch contain code that were (a) not
> present in v1 and (b) not requested by me after v1. So, I could not have
> seen that code or commented on it. I don't think my R-b from v1 should
> have been carried forward to v3, and then used as the basis for pushing
> the v3 patch as 984ba6a46747.
> 
> The commit message doesn't say anything about PcdShellLibAutoInitialize,
> and about the removal of the FileHandleLib resolution.
> 
> The removal of the FileHandleLib resolution under Shell.inf was
> justified, of course (because it was a duplicate / unnecessary
> resolution), but it should have been broken out to a separate patch, or
> at least mentioned in the commit message.
> 
> Also I can find PcdShellLibAutoInitialize in "ShellPkg.dec",
> 
>   ## This flag is used to control initialization of the shell library
>   #  This should be FALSE for compiling the shell application itself only.
> 
> but quoting it in the commit message is helpful. The general idea is to
> spend a bit more time on patch creation so that review is faster/easier
> (there could be multiple reviewers, and in the future the commit could
> be consulted several times).

It's late because I already pushed the patch.:(

> 
> In fact, given how "PcdShellLibAutoInitialize" is now used in the OVMF
> DSC files, I would say that the description in "ShellPkg.dec" is now out
> of date. The documentation should say that the PCD should be FALSE for
> the shell application itself, *plus* DXE_DRIVER modules that implement
> dynamic shell commands.

You are correct. I had another patch to modify the comments in ShellPkg.dec.

> 
> 
> I'm doing my best to be responsive; please give me a chance to comment
> on OvmfPkg changes that I've never seen or requested.

Ok.

> 
> Thanks
> Laszlo
> 
> > diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
> > index 19fa0b4c8d..9d23f8c162 100644
> > --- a/OvmfPkg/OvmfPkgIa32.dsc
> > +++ b/OvmfPkg/OvmfPkgIa32.dsc
> > @@ -193,6 +193,7 @@ [LibraryClasses]
> >    TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
> >  !endif
> >
> > +  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
> >
> S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScript
> Lib.inf
> >    SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf
> >
> OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/
> BaseOrderedCollectionRedBlackTreeLib.inf
> > @@ -783,6 +784,10 @@ [Components]
> >  !endif
> >
> >  !ifndef $(USE_OLD_SHELL)
> > +
> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
> {
> > +    <PcdsFixedAtBuild>
> > +      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> > +  }
> >    ShellPkg/Application/Shell/Shell.inf {
> >      <LibraryClasses>
> >
> ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLi
> b.inf
> > @@ -797,8 +802,6 @@ [Components]
> >
> NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2Co
> mmandsLib.inf
> >  !endif
> >
> HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.i
> nf
> > -      ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
> > -      FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
> >        PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
> >  #      SafeBlockIoLib|ShellPkg/Library/SafeBlockIoLib/SafeBlockIoLib.inf
> >  #
> SafeOpenProtocolLib|ShellPkg/Library/SafeOpenProtocolLib/SafeOpenProtocol
> Lib.inf
> > diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
> > index 06a439f8cb..ba980834d7 100644
> > --- a/OvmfPkg/OvmfPkgIa32.fdf
> > +++ b/OvmfPkg/OvmfPkgIa32.fdf
> > @@ -1,7 +1,7 @@
> >  ## @file
> >  #  Open Virtual Machine Firmware: FDF
> >  #
> > -#  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
> > +#  Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
> >  #  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
> >  #
> >  #  This program and the accompanying materials
> > @@ -285,6 +285,7 @@ [FV.DXEFV]
> >  INF  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
> >
> >  !ifndef $(USE_OLD_SHELL)
> > +INF
> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
> >  INF  ShellPkg/Application/Shell/Shell.inf
> >  !else
> >  INF  RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf
> > diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
> > index e1555dbfa8..a9c667fed8 100644
> > --- a/OvmfPkg/OvmfPkgIa32X64.dsc
> > +++ b/OvmfPkg/OvmfPkgIa32X64.dsc
> > @@ -198,6 +198,7 @@ [LibraryClasses]
> >    TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
> >  !endif
> >
> > +  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
> >
> S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScript
> Lib.inf
> >    SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf
> >
> OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/
> BaseOrderedCollectionRedBlackTreeLib.inf
> > @@ -792,6 +793,10 @@ [Components.X64]
> >  !endif
> >
> >  !ifndef $(USE_OLD_SHELL)
> > +
> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
> {
> > +    <PcdsFixedAtBuild>
> > +      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> > +  }
> >    ShellPkg/Application/Shell/Shell.inf {
> >      <LibraryClasses>
> >
> ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLi
> b.inf
> > @@ -806,8 +811,6 @@ [Components.X64]
> >
> NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2Co
> mmandsLib.inf
> >  !endif
> >
> HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.i
> nf
> > -      ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
> > -      FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
> >        PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
> >  #      SafeBlockIoLib|ShellPkg/Library/SafeBlockIoLib/SafeBlockIoLib.inf
> >  #
> SafeOpenProtocolLib|ShellPkg/Library/SafeOpenProtocolLib/SafeOpenProtocol
> Lib.inf
> > diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
> > index ced4c5639f..72ac82e76b 100644
> > --- a/OvmfPkg/OvmfPkgIa32X64.fdf
> > +++ b/OvmfPkg/OvmfPkgIa32X64.fdf
> > @@ -1,7 +1,7 @@
> >  ## @file
> >  #  Open Virtual Machine Firmware: FDF
> >  #
> > -#  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
> > +#  Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
> >  #  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
> >  #
> >  #  This program and the accompanying materials
> > @@ -286,6 +286,7 @@ [FV.DXEFV]
> >  INF  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
> >
> >  !ifndef $(USE_OLD_SHELL)
> > +INF
> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
> >  INF  ShellPkg/Application/Shell/Shell.inf
> >  !else
> >  INF  RuleOverride = BINARY USE = X64 EdkShellBinPkg/FullShell/FullShell.inf
> > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
> > index 83d63e55d7..abf570512a 100644
> > --- a/OvmfPkg/OvmfPkgX64.dsc
> > +++ b/OvmfPkg/OvmfPkgX64.dsc
> > @@ -198,6 +198,7 @@ [LibraryClasses]
> >    TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
> >  !endif
> >
> > +  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
> >
> S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScript
> Lib.inf
> >    SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf
> >
> OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/
> BaseOrderedCollectionRedBlackTreeLib.inf
> > @@ -790,6 +791,10 @@ [Components]
> >  !endif
> >
> >  !ifndef $(USE_OLD_SHELL)
> > +
> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
> {
> > +    <PcdsFixedAtBuild>
> > +      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
> > +  }
> >    ShellPkg/Application/Shell/Shell.inf {
> >      <LibraryClasses>
> >
> ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLi
> b.inf
> > @@ -804,8 +809,6 @@ [Components]
> >
> NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2Co
> mmandsLib.inf
> >  !endif
> >
> HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.i
> nf
> > -      ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
> > -      FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
> >        PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
> >  #      SafeBlockIoLib|ShellPkg/Library/SafeBlockIoLib/SafeBlockIoLib.inf
> >  #
> SafeOpenProtocolLib|ShellPkg/Library/SafeOpenProtocolLib/SafeOpenProtocol
> Lib.inf
> > diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
> > index 62dd58f6e4..2fc17810eb 100644
> > --- a/OvmfPkg/OvmfPkgX64.fdf
> > +++ b/OvmfPkg/OvmfPkgX64.fdf
> > @@ -1,7 +1,7 @@
> >  ## @file
> >  #  Open Virtual Machine Firmware: FDF
> >  #
> > -#  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
> > +#  Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
> >  #  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
> >  #
> >  #  This program and the accompanying materials
> > @@ -286,6 +286,7 @@ [FV.DXEFV]
> >  INF  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
> >
> >  !ifndef $(USE_OLD_SHELL)
> > +INF
> ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
> >  INF  ShellPkg/Application/Shell/Shell.inf
> >  !else
> >  INF  RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf
> >


^ permalink raw reply	[flat|nested] 20+ messages in thread

end of thread, other threads:[~2017-11-29 13:08 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-29  0:59 [PATCH v3 0/6] Fix build failure due to tftp/dp library removal Ruiyu Ni
2017-11-29  0:59 ` [PATCH v3 1/6] ShellPkg/tftp: Correct file comments header of Tftp.uni Ruiyu Ni
2017-11-29  0:59 ` [PATCH v3 2/6] EmulatorPkg: Fix build failure due to Tftp library removal Ruiyu Ni
2017-11-29  0:59 ` [PATCH v3 3/6] ArmVirtPkg: " Ruiyu Ni
2017-11-29  9:36   ` Ni, Ruiyu
2017-11-29  9:44     ` Ard Biesheuvel
2017-11-29  9:57       ` Ni, Ruiyu
2017-11-29  9:59         ` Ard Biesheuvel
2017-11-29 10:03           ` Ni, Ruiyu
2017-11-29 10:05             ` Ard Biesheuvel
2017-11-29 11:06   ` Laszlo Ersek
2017-11-29  0:59 ` [PATCH v3 4/6] BeagleBoardPkg: " Ruiyu Ni
2017-11-29  7:57   ` Ard Biesheuvel
2017-11-29  8:28     ` Ni, Ruiyu
2017-11-29  8:40       ` Ard Biesheuvel
2017-11-29  0:59 ` [PATCH v3 5/6] CorebootPayloadPkg: Fix build failure due to Tftp/Dp " Ruiyu Ni
2017-11-29  1:51   ` You, Benjamin
2017-11-29  0:59 ` [PATCH v3 6/6] OvmfPkg: Add tftp dynamic command Ruiyu Ni
2017-11-29 10:53   ` Laszlo Ersek
2017-11-29 13:12     ` Ni, Ruiyu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox