summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2024-02-22 11:13:48 +0100
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2024-02-25 17:38:07 +0000
commitefca2c6cfc9f3d87a38a3eb3f89adbe06bef13d3 (patch)
treec18ddffafcff47afc295884f18c44dee6fb3f65a
parent2cb466cc2cbf287e8905192379265a0dcb6db623 (diff)
downloadedk2-efca2c6cfc9f3d87a38a3eb3f89adbe06bef13d3.tar.gz
edk2-efca2c6cfc9f3d87a38a3eb3f89adbe06bef13d3.tar.bz2
edk2-efca2c6cfc9f3d87a38a3eb3f89adbe06bef13d3.zip
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 <kraxel@redhat.com> Reviewed-by: Laszlo Ersek <lersek@redhat.com> Acked-by: Jiewen Yao <Jiewen.yao@intel.com> Message-Id: <20240222101358.67818-3-kraxel@redhat.com>
-rw-r--r--OvmfPkg/Include/Dsc/ShellLibs.dsc.inc10
-rw-r--r--OvmfPkg/OvmfPkgX64.dsc4
2 files changed, 11 insertions, 3 deletions
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