On 2/15/24 11:24, Gerd Hoffmann wrote: > Move EFI Shell libraries from OvmfPkgX64.dsc to > the new ShellComponents.dsc.inc include file. > > Signed-off-by: Gerd Hoffmann <kra...@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
Reviewed-by: Laszlo Ersek <ler...@redhat.com> > > 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 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#115546): https://edk2.groups.io/g/devel/message/115546 Mute This Topic: https://groups.io/mt/104370208/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
