-----邮件原件-----
发件人: bounce+27952+70497+4905953+8761045@groups.io
<bounce+27952+70497+4905953+8761045@groups.io> 代表 Laszlo Ersek
发送时间: 2021年1月18日 16:48
收件人: edk2-devel-groups-io <devel@edk2.groups.io>
抄送: Chasel Chiu <chasel.chiu@intel.com>; Eric Dong
<eric.dong@intel.com>; Kelly Steele <kelly.steele@intel.com>; Liming Gao
<gaoliming@byosoft.com.cn>; Michael D Kinney
<michael.d.kinney@intel.com>; Nate DeSimone
<nathaniel.l.desimone@intel.com>; Philippe Mathieu-Daudé
<philmd@redhat.com>; Yi Qian <yi.qian@intel.com>; Zailiang Sun
<zailiang.sun@intel.com>
主题: [edk2-devel] [edk2-platforms PATCH v2] Intel Platforms: add
OrderedCollectionLib class resolution

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 <chasel.chiu@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Kelly Steele <kelly.steele@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Yi Qian <yi.qian@intel.com>
Cc: Zailiang Sun <zailiang.sun@intel.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3151
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---

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(+)

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/BaseOrderedCollectionRedBlackTreeLi
b/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/UefiShellInstall1Com
mandsLib.inf

NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1
CommandsLib.inf

HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingL
ib.inf
+
OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLi
b/BaseOrderedCollectionRedBlackTreeLib.inf
PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf

BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgC
ommandLib.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/UefiShellInstall1Com
mandsLib.inf

NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1
CommandsLib.inf

HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingL
ib.inf
+
OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLi
b/BaseOrderedCollectionRedBlackTreeLib.inf
PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf

BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgC
ommandLib.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/UefiShellInstall1Com
mandsLib.inf

NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1
CommandsLib.inf

HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingL
ib.inf
+
OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLi
b/BaseOrderedCollectionRedBlackTreeLib.inf
PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf

BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgC
ommandLib.inf
<PcdsFixedAtBuild>
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/UefiShellInstall1Com
mandsLib.inf

NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1
CommandsLib.inf

HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingL
ib.inf
+
OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLi
b/BaseOrderedCollectionRedBlackTreeLib.inf
PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf

BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgC
ommandLib.inf
<PcdsFixedAtBuild>

base-commit: d12d9c963ba3a02252afa9e113c4a3244192ca4a
--
2.19.1.3.g30247aa5d201