Re: [PATCH v3 3/6] ArmVirtPkg: Fix build failure due to Tftp library removal

[Ard Biesheuvel <ard.biesheuvel@linaro.org>]

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