From: "Gerd Hoffmann" <kraxel@redhat.com>
To: devel@edk2.groups.io
Cc: Michael Roth <michael.roth@amd.com>,
Laszlo Ersek <lersek@redhat.com>,
Tom Lendacky <thomas.lendacky@amd.com>,
Min Xu <min.m.xu@intel.com>, Jiewen Yao <jiewen.yao@intel.com>,
Gerd Hoffmann <kraxel@redhat.com>,
Ard Biesheuvel <ardb+tianocore@kernel.org>,
Erdem Aktas <erdemaktas@google.com>,
Oliver Steffen <osteffen@redhat.com>,
Jiewen Yao <Jiewen.yao@intel.com>
Subject: [edk2-devel] [PATCH v3 02/12] OvmfPkg: add ShellLibs.dsc.inc
Date: Thu, 22 Feb 2024 11:13:48 +0100 [thread overview]
Message-ID: <20240222101358.67818-3-kraxel@redhat.com> (raw)
In-Reply-To: <20240222101358.67818-1-kraxel@redhat.com>
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>
---
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 000000000000..f4551ec84aeb
--- /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 043b0a7a67e0..56c920168d25 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -258,9 +258,6 @@ [LibraryClasses]
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 @@ [LibraryClasses]
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
--
2.43.2
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#115784): https://edk2.groups.io/g/devel/message/115784
Mute This Topic: https://groups.io/mt/104505805/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
next prev parent reply other threads:[~2024-02-22 10:14 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-22 10:13 [edk2-devel] [PATCH v3 00/12] OvmfPkg: tweak shell builds Gerd Hoffmann
2024-02-22 10:13 ` [edk2-devel] [PATCH v3 01/12] OvmfPkg: add ShellComponents.dsc.inc Gerd Hoffmann
2024-02-22 10:13 ` Gerd Hoffmann [this message]
2024-02-22 10:13 ` [edk2-devel] [PATCH v3 03/12] OvmfPkg: add ShellDxe.fdf.inc Gerd Hoffmann
2024-02-22 10:13 ` [edk2-devel] [PATCH v3 04/12] OvmfPkg: Shell*.inc: allow building without network support Gerd Hoffmann
2024-02-22 10:13 ` [edk2-devel] [PATCH v3 05/12] OvmfPkg: ShellDxe.fdf.inc: add VariablePolicyDynamicCommand to FV Gerd Hoffmann
2024-02-22 10:13 ` [edk2-devel] [PATCH v3 06/12] OvmfPkg: switch OvmfPkgIa32 to new shell include files Gerd Hoffmann
2024-02-22 10:13 ` [edk2-devel] [PATCH v3 07/12] OvmfPkg: switch OvmfPkgIa32X64 " Gerd Hoffmann
2024-02-22 10:13 ` [edk2-devel] [PATCH v3 08/12] OvmfPkg: switch AmdSevX64 " Gerd Hoffmann
2024-02-22 10:13 ` [edk2-devel] [PATCH v3 09/12] OvmfPkg: switch IntelTdxX64 " Gerd Hoffmann
2024-02-22 10:13 ` [edk2-devel] [PATCH v3 10/12] OvmfPkg: switch MicrovmX64 " Gerd Hoffmann
2024-02-22 10:13 ` [edk2-devel] [PATCH v3 11/12] OvmfPkg/CI: copy shell to virtual drive Gerd Hoffmann
2024-02-22 10:13 ` [edk2-devel] [PATCH v3 12/12] OvmfPkg: only add shell to FV in case secure boot is disabled Gerd Hoffmann
2024-02-25 17:50 ` [edk2-devel] [PATCH v3 00/12] OvmfPkg: tweak shell builds Laszlo Ersek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240222101358.67818-3-kraxel@redhat.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox