From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Permerror (SPF Permanent Error: More than 10 MX records returned) identity=mailfrom; client-ip=134.134.136.126; helo=mga18.intel.com; envelope-from=jordan.l.justen@intel.com; receiver=edk2-devel@lists.01.org Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 04E1821B02830 for ; Wed, 6 Dec 2017 23:30:34 -0800 (PST) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Dec 2017 23:35:07 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,371,1508828400"; d="scan'208";a="184861375" Received: from bmark-mobl1.amr.corp.intel.com (HELO localhost) ([10.254.121.251]) by fmsmga006.fm.intel.com with ESMTP; 06 Dec 2017 23:35:05 -0800 MIME-Version: 1.0 To: Ruiyu Ni , edk2-devel@lists.01.org Message-ID: <151263210512.7767.9529631564610895516@jljusten-skl> From: Jordan Justen In-Reply-To: <20171207071700.160544-1-ruiyu.ni@intel.com> Cc: Andrew Fish References: <20171207071700.160544-1-ruiyu.ni@intel.com> User-Agent: alot/0.6 Date: Wed, 06 Dec 2017 23:35:05 -0800 Subject: Re: [PATCH] EmulatorPkg: Fix build failure due to Tftp library removal X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2017 07:30:35 -0000 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Reviewed-by: Jordan Justen On 2017-12-06 23:17:00, Ruiyu Ni wrote: > The TFTP command was converted from a NULL class library instance to > a dynamic shell command in commit 0961002352e9. > = > The ShellLib and FileHandleLib resolutions are moved from > Shell app to [LibraryClasses.common] > because dynamic shell commands implemented as DXE_DRIVER modules > also depend on these libraries. > = > PcdShellLibAutoInitialize must be set to FALSE for both the shell app > itself and the dynamic shell command modules. > = > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ruiyu Ni > Cc: Jordan Justen > Cc: Andrew Fish > --- > 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/UefiBootMan= agerLib.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 { > + > + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > + } > ShellPkg/Application/Shell/Shell.inf { > > ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellComm= andLib.inf > @@ -388,12 +394,8 @@ [Components] > NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Co= mmandsLib.inf > NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstal= l1CommandsLib.inf > NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwor= k1CommandsLib.inf > - NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommand= Lib.inf > HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleP= arsingLib.inf > - ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf > - FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.i= nf > SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf > - UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBoo= tManagerLib.inf > PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf > # SafeBlockIoLib|ShellPkg/Library/SafeBlockIoLib/SafeBlockIoLib.inf > # SafeOpenProtocolLib|ShellPkg/Library/SafeOpenProtocolLib/SafeOpen= ProtocolLib.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.
> +# Copyright (c) 2008 - 2017, Intel Corporation. All rights reserved.
> # Portions copyright (c) 2009 - 2011, Apple Inc. All rights reserved.
> # > # 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 =3D BINARY EdkShellBinPkg/FullShell/FullShell.inf > -- = > 2.15.0.gvfs.1.preview.4 > = > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel