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.web11.8962.1611046551357925050 for ; Tue, 19 Jan 2021 00:55:51 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Q/jyPoan; 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=1611046549; 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=YJC1ti/LXsWoEjoN1TnhYLMEH5LzzBNcBxn0raYFziI=; b=Q/jyPoanVnoTwuOwDoK4FCYvbvtksoOhOj/75LH3giuGOBCncjPMIc28eqKyP0ljzxRu5y hGSxoI/H8EQfFOE1a31s6versqC8B6g7w7KzzgeIETUM1CHwhnwkim3ISQfftIM1sUzY6x 4cZx+3s/ezftqLRtmNGqfVr3G+BHK84= 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-484-huRAs75cPcqJPkmXcX5Cew-1; Tue, 19 Jan 2021 03:55:44 -0500 X-MC-Unique: huRAs75cPcqJPkmXcX5Cew-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3583115732; Tue, 19 Jan 2021 08:55:43 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-113-176.ams2.redhat.com [10.36.113.176]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9C0487770F; Tue, 19 Jan 2021 08:55:40 +0000 (UTC) Subject: Re: [edk2-devel] [edk2-platforms PATCH v2] Intel Platforms: add OrderedCollectionLib class resolution From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Chasel Chiu , Eric Dong , Kelly Steele , Liming Gao , Michael D Kinney , Nate DeSimone , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , Yi Qian , Zailiang Sun Reply-To: devel@edk2.groups.io, lersek@redhat.com References: <20210118084803.22552-1-lersek@redhat.com> Message-ID: <98b73fc3-7beb-6175-229e-678a7eaa2fd0@redhat.com> Date: Tue, 19 Jan 2021 09:55:39 +0100 MIME-Version: 1.0 In-Reply-To: <20210118084803.22552-1-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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:48, 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: Chasel Chiu > Cc: Eric Dong > Cc: Kelly Steele > Cc: Liming Gao > Cc: Michael D Kinney > Cc: Nate DeSimone > Cc: Philippe Mathieu-Daudé > Cc: Yi Qian > Cc: Zailiang Sun > Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3151 > Signed-off-by: Laszlo Ersek > --- > > Notes: > v2: > > - extract OpenBoardPkg update from CometlakeURvp, GalagoPro3, > KabylakeRvp3, BoardX58Ich10, UpXtreme, WhiskeylakeURvp to > "MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc" [Liming] > > - do not pick up Phil's and Nate's R-b, due to the above change > > Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc | 1 + > Platform/Intel/QuarkPlatformPkg/Quark.dsc | 1 + > Platform/Intel/QuarkPlatformPkg/QuarkMin.dsc | 1 + > Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 1 + > Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 1 + > 5 files changed, 5 insertions(+) Thanks for the reviews; pushed as commit b29970a5c5a1. Laszlo > > diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc > index 5e3405d54785..cb40e111b5dd 100644 > --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc > +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc > @@ -96,6 +96,7 @@ [LibraryClasses.common] > ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf > FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf > SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf > + OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf > > # > # CPU > 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/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 > > > base-commit: d12d9c963ba3a02252afa9e113c4a3244192ca4a >