From efca2c6cfc9f3d87a38a3eb3f89adbe06bef13d3 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Thu, 22 Feb 2024 11:13:48 +0100 Subject: OvmfPkg: add ShellLibs.dsc.inc Move EFI Shell libraries from OvmfPkgX64.dsc to the new ShellComponents.dsc.inc include file. Signed-off-by: Gerd Hoffmann Reviewed-by: Laszlo Ersek Acked-by: Jiewen Yao Message-Id: <20240222101358.67818-3-kraxel@redhat.com> --- OvmfPkg/Include/Dsc/ShellLibs.dsc.inc | 10 ++++++++++ OvmfPkg/OvmfPkgX64.dsc | 4 +--- 2 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 OvmfPkg/Include/Dsc/ShellLibs.dsc.inc diff --git a/OvmfPkg/Include/Dsc/ShellLibs.dsc.inc b/OvmfPkg/Include/Dsc/ShellLibs.dsc.inc new file mode 100644 index 0000000000..f4551ec84a --- /dev/null +++ b/OvmfPkg/Include/Dsc/ShellLibs.dsc.inc @@ -0,0 +1,10 @@ +## +# SPDX-License-Identifier: BSD-2-Clause-Patent +## + +!if $(BUILD_SHELL) == TRUE + +[LibraryClasses] + ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf + +!endif diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index 043b0a7a67..56c920168d 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -258,9 +258,6 @@ TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf !endif -!if $(BUILD_SHELL) == TRUE - ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf -!endif ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf @@ -268,6 +265,7 @@ OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf !include OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc +!include OvmfPkg/Include/Dsc/ShellLibs.dsc.inc [LibraryClasses.common] BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf -- cgit v1.2.3