Some of the libraries under ShellPkg/Library/ are only intended to be
loaded into the Shell by means of a NULL LibraryClass resolution, and
serve no other purpose. Since the Shell itself is a UEFI_APPLICATION, it
makes sense to set the module type of those libraries to UEFI_APPLICATION
as well.

This allows us to use different compiler flags for the Shell application
itself but also for the majority of its constituent parts that are built
separately via these libraries.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <[email protected]>
---
 .../Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf   | 2 +-
 .../Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf | 2 +-
 .../Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf   | 2 +-
 .../Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf   | 2 +-
 .../Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf   | 2 +-
 .../UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf       | 2 +-
 ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git 
a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf 
b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
index d8451c397652..55371eb37194 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
@@ -16,7 +16,7 @@ [Defines]
   INF_VERSION                    = 0x00010006
   BASE_NAME                      = UefiShellDebug1CommandsLib
   FILE_GUID                      = 90330D51-A99B-4cc8-A2EB-AE22542A3F45
-  MODULE_TYPE                    = UEFI_DRIVER
+  MODULE_TYPE                    = UEFI_APPLICATION
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = NULL|UEFI_APPLICATION UEFI_DRIVER
   CONSTRUCTOR                    = UefiShellDebug1CommandsLibConstructor
diff --git 
a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf 
b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf
index a813b3b614f9..f2a2e4c581b0 100644
--- 
a/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf
+++ 
b/ShellPkg/Library/UefiShellDriver1CommandsLib/UefiShellDriver1CommandsLib.inf
@@ -16,7 +16,7 @@ [Defines]
   INF_VERSION                    = 0x00010006
   BASE_NAME                      = UefiShellDriver1CommandsLib
   FILE_GUID                      = 313D3674-3ED4-48fd-BF97-7DB35D4190D1
-  MODULE_TYPE                    = UEFI_DRIVER
+  MODULE_TYPE                    = UEFI_APPLICATION
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = NULL|UEFI_APPLICATION UEFI_DRIVER
   CONSTRUCTOR                    = UefiShellDriver1CommandsLibConstructor
diff --git 
a/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf 
b/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf
index d21ad41ca9f3..4d3713b46092 100644
--- a/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf
+++ b/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.inf
@@ -16,7 +16,7 @@ [Defines]
   INF_VERSION                    = 0x00010006
   BASE_NAME                      = UefiShellLevel1CommandsLib
   FILE_GUID                      = 50cb6037-1102-47af-b2dd-9944b6eb1abe
-  MODULE_TYPE                    = UEFI_DRIVER
+  MODULE_TYPE                    = UEFI_APPLICATION
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = NULL|UEFI_APPLICATION UEFI_DRIVER
   CONSTRUCTOR                    = ShellLevel1CommandsLibConstructor
diff --git 
a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf 
b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
index 324d210d31ca..76540fb3a364 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.inf
@@ -17,7 +17,7 @@ [Defines]
   INF_VERSION                    = 0x00010006
   BASE_NAME                      = UefiShellLevel2CommandsLib
   FILE_GUID                      = CBF3931C-A2DF-40e5-B77E-CCA9555E9755
-  MODULE_TYPE                    = UEFI_DRIVER
+  MODULE_TYPE                    = UEFI_APPLICATION
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = NULL|UEFI_APPLICATION UEFI_DRIVER
   CONSTRUCTOR                    = ShellLevel2CommandsLibConstructor
diff --git 
a/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf 
b/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf
index 7cc49605ee86..a13cd9babf55 100644
--- a/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf
+++ b/ShellPkg/Library/UefiShellLevel3CommandsLib/UefiShellLevel3CommandsLib.inf
@@ -19,7 +19,7 @@ [Defines]
   INF_VERSION                    = 0x00010006
   BASE_NAME                      = UefiShellLevel3CommandsLib
   FILE_GUID                      = 71374B42-85D7-4753-AD17-AA84C3A0EB93
-  MODULE_TYPE                    = UEFI_DRIVER
+  MODULE_TYPE                    = UEFI_APPLICATION
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = NULL|UEFI_APPLICATION UEFI_DRIVER
   CONSTRUCTOR                    = ShellLevel3CommandsLibConstructor
diff --git 
a/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
 
b/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
index 6dfbbe52b279..92d47d114f6b 100644
--- 
a/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
+++ 
b/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
@@ -17,7 +17,7 @@ [Defines]
   INF_VERSION                    = 0x00010006
   BASE_NAME                      = UefiShellNetwork1CommandsLib
   FILE_GUID                      = 9A929F7E-3861-45ce-87AB-7371219AE255
-  MODULE_TYPE                    = UEFI_DRIVER
+  MODULE_TYPE                    = UEFI_APPLICATION
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = NULL|UEFI_APPLICATION UEFI_DRIVER
   CONSTRUCTOR                    = ShellNetwork1CommandsLibConstructor
diff --git 
a/ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf 
b/ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf
index 43b367d388e9..96db25892078 100644
--- a/ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf
+++ b/ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf
@@ -18,7 +18,7 @@ [Defines]
   INF_VERSION                    = 0x00010006
   BASE_NAME                      = UefiShellTftpCommandLib
   FILE_GUID                      = D2B61A25-9835-4E5D-906A-15615E1FF668
-  MODULE_TYPE                    = UEFI_DRIVER
+  MODULE_TYPE                    = UEFI_APPLICATION
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = NULL|UEFI_APPLICATION UEFI_DRIVER
   CONSTRUCTOR                    = ShellTftpCommandLibConstructor
-- 
1.9.1

_______________________________________________
edk2-devel mailing list
[email protected]
https://lists.01.org/mailman/listinfo/edk2-devel

Reply via email to