From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.groups.io with SMTP id smtpd.web10.30751.1610957922111979906 for ; Mon, 18 Jan 2021 00:18:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Bm0L4JVg; spf=pass (domain: redhat.com, ip: 63.128.21.124, mailfrom: lersek@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610957921; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JcD+kMwY0hu/J77pwUEh30i60/XnfP/qG3j2C4Vkqs0=; b=Bm0L4JVgkWzgSDXMtYzJHqV5RblmkEyLBIwgQuC86Hh0pe1si79boGCXRBxEzx2bprthsd jpu5jp+7/X1goTKbFOmIuNDmXEhSfsC5nVRiyKNBbjfZYQHy2lYzmF/0ykYp8+7H9+q6xW inITBLnl6WE/3ItDUul5bYyzmtDmQkc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-510-Q6sml2usMtmFNoSLzQ5Gow-1; Mon, 18 Jan 2021 03:18:39 -0500 X-MC-Unique: Q6sml2usMtmFNoSLzQ5Gow-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BD4229CDA3; Mon, 18 Jan 2021 08:18:37 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-113-141.ams2.redhat.com [10.36.113.141]) by smtp.corp.redhat.com (Postfix) with ESMTP id A31F360BFA; Mon, 18 Jan 2021 08:18:34 +0000 (UTC) Subject: Re: [edk2-devel] [edk2-platforms PATCH 3/3] Intel Platforms: add OrderedCollectionLib class resolution From: "Laszlo Ersek" To: devel@edk2.groups.io Cc: Agyeman Prince , Chasel Chiu , Deepika Kethi Reddy , Jeremy Soller , Kathappan Esakkithevar , Kelly Steele , Michael D Kinney , Nate DeSimone , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , Rangasai V Chaganty , Yi Qian , Zailiang Sun Reply-To: devel@edk2.groups.io, lersek@redhat.com References: <20210113082843.9095-1-lersek@redhat.com> <20210113082843.9095-4-lersek@redhat.com> Message-ID: Date: Mon, 18 Jan 2021 09:18:33 +0100 MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=lersek@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit On 01/18/21 09:16, Laszlo Ersek wrote: > On 01/13/21 09:28, Laszlo Ersek wrote: >> The edk2 patch >> >> ShellPkg/ShellCommandLib: add ShellSortFileList >> >> for BZ#3151 will make the >> >> ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf >> >> instance dependent on the OrderedCollectionLib class. Because the shell >> binaries in the Intel platform DSCs consume the above UefiShellCommandLib >> instance, resolve the OrderedCollectionLib class in them. >> >> Cc: Agyeman Prince >> Cc: Chasel Chiu >> Cc: Deepika Kethi Reddy >> Cc: Jeremy Soller >> Cc: Kathappan Esakkithevar >> Cc: Kelly Steele >> Cc: Michael D Kinney >> Cc: Nate DeSimone >> Cc: Philippe Mathieu-Daudé >> Cc: Rangasai V Chaganty >> Cc: Yi Qian >> Cc: Zailiang Sun >> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3151 >> Signed-off-by: Laszlo Ersek >> --- >> Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.dsc | 1 + >> Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc | 1 + >> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc | 1 + >> Platform/Intel/QuarkPlatformPkg/Quark.dsc | 1 + >> Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc | 1 + >> Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc | 1 + >> Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 1 + >> Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 1 + >> Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.dsc | 1 + >> Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.dsc | 1 + >> 10 files changed, 10 insertions(+) > > This patch has been committed with hash d12d9c963ba3. I'm sorry -- I did the right thing regarding the master branch in edk2-platforms, but commented under the wrong patch on the list. I'm going to submit a new version of patch#3, as suggested by Liming. Commit d12d9c963ba3 is what patch#2 of this series has become. Sorry about the confusion, Laszlo >> >> diff --git a/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.dsc b/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.dsc >> index 6de834565a7a..775eda4b03bc 100644 >> --- a/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.dsc >> +++ b/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.dsc >> @@ -378,6 +378,7 @@ [Components.X64] >> NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf >> ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf >> HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf >> + OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf >> BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf >> ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf >> ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf >> diff --git a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc >> index 862e6a6655a3..c400173f7e0a 100644 >> --- a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc >> +++ b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc >> @@ -350,6 +350,7 @@ [Components.X64] >> NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf >> ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf >> HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf >> + OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf >> BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf >> ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf >> ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf >> diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc >> index 0b30da8f9665..d76c220b9145 100644 >> --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc >> +++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc >> @@ -429,6 +429,7 @@ [Components.X64] >> NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf >> ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf >> HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf >> + OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf >> BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf >> ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf >> ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf >> diff --git a/Platform/Intel/QuarkPlatformPkg/Quark.dsc b/Platform/Intel/QuarkPlatformPkg/Quark.dsc >> index 9f64dcb62724..e29c7465b1e4 100644 >> --- a/Platform/Intel/QuarkPlatformPkg/Quark.dsc >> +++ b/Platform/Intel/QuarkPlatformPkg/Quark.dsc >> @@ -912,6 +912,7 @@ [Components.IA32] >> NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf >> NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf >> HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf >> + OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf >> PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf >> BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf >> >> diff --git a/Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc b/Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc >> index db144aab75ae..6fdfba9a58dc 100644 >> --- a/Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc >> +++ b/Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc >> @@ -639,6 +639,7 @@ [Components.IA32] >> NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf >> NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf >> HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf >> + OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf >> PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf >> BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf >> >> diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc >> index 77c408a326db..186e0a0df980 100644 >> --- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc >> +++ b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc >> @@ -270,6 +270,7 @@ [Components.X64] >> NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf >> ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf >> HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf >> + OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf >> BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf >> ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf >> ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf >> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc >> index 4fa3e2013120..409f31c982d7 100644 >> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc >> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc >> @@ -1152,6 +1152,7 @@ [Components.IA32] >> NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf >> NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf >> HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf >> + OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf >> PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf >> BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf >> >> diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc >> index 8adae2e24993..38bd825c8bdc 100644 >> --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc >> +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc >> @@ -1167,6 +1167,7 @@ [Components.X64] >> NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf >> NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf >> HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf >> + OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf >> PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf >> BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf >> >> diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.dsc b/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.dsc >> index fb493973e22d..463234a3d948 100644 >> --- a/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.dsc >> +++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.dsc >> @@ -371,6 +371,7 @@ [Components.X64] >> NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf >> ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf >> HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf >> + OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf >> BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf >> ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf >> ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf >> diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.dsc b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.dsc >> index 9a1f107fafe1..586fa848650f 100644 >> --- a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.dsc >> +++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.dsc >> @@ -377,6 +377,7 @@ [Components.X64] >> NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf >> ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf >> HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf >> + OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf >> BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf >> ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf >> ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf >> >