ShellPkg: Enable Runtime DXE drivers to make use of Shell libraries with the expectat...

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eugene Cohen eugene@hp.com
reviewed-by: jaben carsey jaben.carsey@intel.com

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13380 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ShellPkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf b/ShellPkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
index dbeb6ba5f319749f30f69299b21bde9c0d02278c..1d27c6da2c94df9a5aa5e00ad8f362264d2c703c 100644 (file)
--- a/ShellPkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
+++ b/ShellPkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
@@ -19,7 +19,7 @@
   FILE_GUID                      = 9495D344-9D8A-41f3-8D17-E2FD238C4E71\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
-  LIBRARY_CLASS                  = FileHandleLib|DXE_DRIVER UEFI_APPLICATION UEFI_DRIVER\r
+  LIBRARY_CLASS                  = FileHandleLib|DXE_DRIVER UEFI_APPLICATION UEFI_DRIVER DXE_RUNTIME_DRIVER\r
 \r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r

diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
index ddba0cfa181a1e1807433963aa616f43f855191f..15226a0b2efa00078b65b6e2abe31352e8f9191b 100644 (file)
--- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
+++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
@@ -18,7 +18,7 @@
   FILE_GUID                      = 3CDC7177-CC2A-4678-BA8F-1A936A093FA4\r
   MODULE_TYPE                    = UEFI_DRIVER\r
   VERSION_STRING                 = 1.0\r
-  LIBRARY_CLASS                  = HandleParsingLib|UEFI_APPLICATION UEFI_DRIVER\r
+  LIBRARY_CLASS                  = HandleParsingLib|UEFI_APPLICATION UEFI_DRIVER DXE_RUNTIME_DRIVER\r
   CONSTRUCTOR                    = HandleParsingLibConstructor\r
   DESTRUCTOR                     = HandleParsingLibDestructor\r
 \r

diff --git a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
index fb361a67f4ad705d01cbd1d7ea12f7a64ab60449..6b3d774f47c1a2676dbfeff692c7d9d4d50c0f79 100644 (file)
--- a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
+++ b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
@@ -19,7 +19,7 @@
   FILE_GUID                      = 5C12F31F-EBAC-466e-A400-FCA8C9EA3A05\r
   MODULE_TYPE                    = UEFI_DRIVER\r
   VERSION_STRING                 = 1.0\r
-  LIBRARY_CLASS                  = ShellCommandLib|UEFI_APPLICATION UEFI_DRIVER\r
+  LIBRARY_CLASS                  = ShellCommandLib|UEFI_APPLICATION UEFI_DRIVER DXE_RUNTIME_DRIVER\r
   CONSTRUCTOR                    = ShellCommandLibConstructor\r
   DESTRUCTOR                     = ShellCommandLibDestructor\r
 \r
@@ -46,6 +46,7 @@
   UefiBootServicesTableLib\r
   ShellLib\r
   HiiLib\r
+  HandleParsingLib\r
 \r
 [Protocols]\r
   gEfiUnicodeCollation2ProtocolGuid                       # ALWAYS_CONSUMED\r
@@ -59,3 +60,6 @@
 [Pcd.common]\r
   gEfiShellPkgTokenSpaceGuid.PcdShellSupportLevel         ## ALWAYS_CONSUMED\r
   gEfiShellPkgTokenSpaceGuid.PcdShellMapNameLength        ## ALWAYS_CONSUMED\r
+\r
+[Depex]\r
+  gEfiUnicodeCollation2ProtocolGuid\r

diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.inf b/ShellPkg/Library/UefiShellLib/UefiShellLib.inf
index 18803bdcb8e53bdc11287945786cfc7a7f95f443..9606ebf5c583699cfe95d00b4f96b74f5b61661d 100644 (file)
--- a/ShellPkg/Library/UefiShellLib/UefiShellLib.inf
+++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.inf
@@ -19,7 +19,7 @@
   FILE_GUID                      = 449D0F00-2148-4a43-9836-F10B3980ECF5\r
   MODULE_TYPE                    = UEFI_DRIVER\r
   VERSION_STRING                 = 1.0\r
-  LIBRARY_CLASS                  = ShellLib|UEFI_APPLICATION UEFI_DRIVER\r
+  LIBRARY_CLASS                  = ShellLib|UEFI_APPLICATION UEFI_DRIVER DXE_RUNTIME_DRIVER\r
   CONSTRUCTOR                    = ShellLibConstructor\r
   DESTRUCTOR                     = ShellLibDestructor\r
 \r

diff --git a/ShellPkg/Library/UefiSortLib/UefiSortLib.inf b/ShellPkg/Library/UefiSortLib/UefiSortLib.inf
index 522d4d8537038133943be0676625f46b011fec53..8080cc0c826dde026f7589479e83f6c1837816e6 100644 (file)
--- a/ShellPkg/Library/UefiSortLib/UefiSortLib.inf
+++ b/ShellPkg/Library/UefiSortLib/UefiSortLib.inf
@@ -19,7 +19,7 @@
   FILE_GUID                      = 4264A823-45A3-42db-B92C-AA078555CBD3\r
   MODULE_TYPE                    = UEFI_DRIVER\r
   VERSION_STRING                 = 1.0\r
-  LIBRARY_CLASS                  = SortLib|UEFI_APPLICATION UEFI_DRIVER UEFI_DRIVER\r
+  LIBRARY_CLASS                  = SortLib|UEFI_APPLICATION UEFI_DRIVER UEFI_DRIVER DXE_RUNTIME_DRIVER\r
 \r
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r