From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.100; helo=mga07.intel.com; envelope-from=ruiyu.ni@intel.com; receiver=edk2-devel@lists.01.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (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 BC9AB21188465 for ; Wed, 31 Oct 2018 02:12:36 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Oct 2018 02:12:36 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,447,1534834800"; d="scan'208";a="85586764" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by orsmga007.jf.intel.com with ESMTP; 31 Oct 2018 02:12:36 -0700 Received: from FMSMSX109.amr.corp.intel.com (10.18.116.9) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.408.0; Wed, 31 Oct 2018 02:12:35 -0700 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by fmsmsx109.amr.corp.intel.com (10.18.116.9) with Microsoft SMTP Server (TLS) id 14.3.408.0; Wed, 31 Oct 2018 02:12:35 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.117]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.102]) with mapi id 14.03.0415.000; Wed, 31 Oct 2018 17:12:32 +0800 From: "Ni, Ruiyu" To: "Zhang, Shenglei" , "edk2-devel@lists.01.org" CC: "Justen, Jordan L" , Andrew Fish Thread-Topic: [PATCH 2/5] EmulatorPkg: Remove EdkShellBinPkg in FDF and DEC Thread-Index: AQHUcN6aGf8lgLhsjkmuI+Ekjb4Z86U5EfXw Date: Wed, 31 Oct 2018 09:12:31 +0000 Message-ID: <734D49CCEBEEF84792F5B80ED585239D5BEE8E54@SHSMSX104.ccr.corp.intel.com> References: <20181031055711.11724-1-shenglei.zhang@intel.com> <20181031055711.11724-3-shenglei.zhang@intel.com> In-Reply-To: <20181031055711.11724-3-shenglei.zhang@intel.com> Accept-Language: en-US, zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH 2/5] EmulatorPkg: Remove EdkShellBinPkg in FDF and DEC X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Oct 2018 09:12:36 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Shenglei, The patch is not complete for removing EDK SHELL from EmulatorPkg. Please also review all references of "USE_OLD_SHELL" and remove the related= contents. Same comments apply to the changes to other platforms. Thanks/Ray > -----Original Message----- > From: Zhang, Shenglei > Sent: Wednesday, October 31, 2018 1:57 PM > To: edk2-devel@lists.01.org > Cc: Justen, Jordan L ; Ni, Ruiyu > ; Andrew Fish > Subject: [PATCH 2/5] EmulatorPkg: Remove EdkShellBinPkg in FDF and DEC >=20 > Remove EdkShellBinPkg in EmulatorPkg.dec and EmulatorPkg.fdf. > https://bugzilla.tianocore.org/show_bug.cgi?id=3D1108 >=20 > Cc: Jordan Justen > Cc: Ruiyu Ni > Cc: Andrew Fish > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: shenglei > --- > EmulatorPkg/EmulatorPkg.dec | 2 +- > EmulatorPkg/EmulatorPkg.fdf | 4 ---- > 2 files changed, 1 insertion(+), 5 deletions(-) >=20 > diff --git a/EmulatorPkg/EmulatorPkg.dec b/EmulatorPkg/EmulatorPkg.dec > index 25f79c92c9..9be8a90e5b 100644 > --- a/EmulatorPkg/EmulatorPkg.dec > +++ b/EmulatorPkg/EmulatorPkg.dec > @@ -96,7 +96,7 @@ >=20 > gEmulatorPkgTokenSpaceGuid.PcdEmuVirtualDisk|L"disk.dmg:FW"|VOID*|0 > x00001001 >=20 > gEmulatorPkgTokenSpaceGuid.PcdEmuGop|L"GOP > Window"|VOID*|0x00001018 > - > gEmulatorPkgTokenSpaceGuid.PcdEmuFileSystem|L".!../../../../../EdkShellBi > nPkg/bin/ia32/Apps"|VOID*|0x00001004 > + > gEmulatorPkgTokenSpaceGuid.PcdEmuFileSystem|L"."|VOID*|0x00001004 >=20 > gEmulatorPkgTokenSpaceGuid.PcdEmuSerialPort|L"/dev/ttyS0"|VOID*|0x0 > 0001002 >=20 > gEmulatorPkgTokenSpaceGuid.PcdEmuNetworkInterface|L"en0"|VOID*|0x > 0000100d >=20 > diff --git a/EmulatorPkg/EmulatorPkg.fdf b/EmulatorPkg/EmulatorPkg.fdf > index 5b5f81443d..915321eb7a 100644 > --- a/EmulatorPkg/EmulatorPkg.fdf > +++ b/EmulatorPkg/EmulatorPkg.fdf > @@ -208,12 +208,8 @@ INF > MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf >=20 > INF FatPkg/EnhancedFatDxe/Fat.inf >=20 > -!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 > -!endif >=20 > [Rule.Common.SEC] > FILE SEC =3D $(NAMED_GUID) { > -- > 2.18.0.windows.1