OvmfPkg: Use OvmfPkg/Include/*/Shell*.inc throughout

While fixing https://github.com/tianocore/edk2/pull/6092 (the
fact that some OvmfPkg and ArmVirtPkg platforms included residual
NetworkPkg components even when compiled with -D NETWORK_ENABLE=0),
it was noted that OvmfPkg/Include/*/Shell*.inc files which apply
the required fix logic are available and already used in some
OvmfPkg platforms.

This commit applies these files consistently within OvmfPkg.

This has the side effect that some platforms now include one or
more of HttpDynamicCommand, VariablePolicyDynamicCommand and
LinuxInitrdDynamicShellCommand when they previously did not.
This fixes unintentional drift between platforms, and provides
additional shell commands which may be useful in some cases.

Signed-off-by: Mike Beaton <mjsbeaton@gmail.com>

1 files changed, 4 insertions, 44 deletions

diff --git a/OvmfPkg/RiscVVirt/RiscVVirt.dsc.inc b/OvmfPkg/RiscVVirt/RiscVVirt.dsc.inc
index 0f2a082f53..19a1dcc436 100644
--- a/OvmfPkg/RiscVVirt/RiscVVirt.dsc.inc
+++ b/OvmfPkg/RiscVVirt/RiscVVirt.dsc.inc
@@ -51,7 +51,9 @@
   HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf

   UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf

   SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf

-  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf

+

+!include OvmfPkg/Include/Dsc/ShellLibs.dsc.inc

+

   ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf

   FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf

   PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf

@@ -287,49 +289,7 @@
   #

   MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf

 

-!if $(NETWORK_ENABLE) == TRUE

-  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {

-    <PcdsFixedAtBuild>

-      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

-  }

-  ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf {

-    <PcdsFixedAtBuild>

-      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

-  }

-!endif

-  OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf {

-    <PcdsFixedAtBuild>

-      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

-  }

-  ShellPkg/Application/Shell/Shell.inf {

-    <LibraryClasses>

-      ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf

-      NULL|ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf

-      NULL|ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf

-      NULL|ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf

-      NULL|ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf

-      NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf

-!if $(ACPIVIEW_ENABLE) == TRUE

-      NULL|ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.inf

-!endif

-      NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf

-!if $(NETWORK_ENABLE) == TRUE

-!if $(NETWORK_IP4_ENABLE) == TRUE

-      NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf

-!endif

-!if $(NETWORK_IP6_ENABLE) == TRUE

-      NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf

-!endif

-!endif

-      HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf

-      PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf

-      BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf

-

-    <PcdsFixedAtBuild>

-      gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF

-      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

-      gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000

-  }

+!include OvmfPkg/Include/Dsc/ShellComponents.dsc.inc

 

   #

   # ACPI Support