merge latest branch 'svn' (4708)

RehabMan · Oct 17, 2018 · 49815fc · 49815fc
2 parents aeb6a55 + d631f79
commit 49815fc
Show file tree

Hide file tree

Showing 77 changed files with 719 additions and 374 deletions.
diff --git a/FileSystems/GrubFS/src/AFFS.inf b/FileSystems/GrubFS/src/AFFS.inf
@@ -33,7 +33,7 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        ShellPkg/ShellPkg.dec
+        Clover/ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
         Clover/CloverPkg.dec	
         Clover/FileSystems/GrubFS/efifs.dec

diff --git a/FileSystems/GrubFS/src/AFS.inf b/FileSystems/GrubFS/src/AFS.inf
@@ -33,7 +33,7 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        ShellPkg/ShellPkg.dec
+        Clover/ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
         Clover/CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec

diff --git a/FileSystems/GrubFS/src/BFS.inf b/FileSystems/GrubFS/src/BFS.inf
@@ -33,7 +33,7 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        ShellPkg/ShellPkg.dec
+        Clover/ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
         Clover/CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec

diff --git a/FileSystems/GrubFS/src/BTRFS.inf b/FileSystems/GrubFS/src/BTRFS.inf
@@ -37,7 +37,7 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        ShellPkg/ShellPkg.dec
+        Clover/ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
         Clover/CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec

diff --git a/FileSystems/GrubFS/src/CBFS.inf b/FileSystems/GrubFS/src/CBFS.inf
@@ -36,7 +36,7 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        ShellPkg/ShellPkg.dec
+        Clover/ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
         Clover/CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec

diff --git a/FileSystems/GrubFS/src/CPIO.inf b/FileSystems/GrubFS/src/CPIO.inf
@@ -34,7 +34,7 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        ShellPkg/ShellPkg.dec
+        Clover/ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
         Clover/CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec

diff --git a/FileSystems/GrubFS/src/CPIO_BE.inf b/FileSystems/GrubFS/src/CPIO_BE.inf
@@ -34,7 +34,7 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        ShellPkg/ShellPkg.dec
+        Clover/ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
         Clover/CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec

diff --git a/FileSystems/GrubFS/src/EXFAT.inf b/FileSystems/GrubFS/src/EXFAT.inf
@@ -33,7 +33,7 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        ShellPkg/ShellPkg.dec
+        Clover/ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
         Clover/CloverPkg.dec
         Clover/FileSystems/GrubFS/efifs.dec

diff --git a/FileSystems/GrubFS/src/EXT2.inf b/FileSystems/GrubFS/src/EXT2.inf
@@ -33,7 +33,7 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        ShellPkg/ShellPkg.dec
+        Clover/ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
         Clover/CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec

diff --git a/FileSystems/GrubFS/src/FAT.inf b/FileSystems/GrubFS/src/FAT.inf
@@ -33,7 +33,7 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        ShellPkg/ShellPkg.dec
+        Clover/ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
         Clover/CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec

diff --git a/FileSystems/GrubFS/src/HFS.inf b/FileSystems/GrubFS/src/HFS.inf
@@ -33,7 +33,7 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        ShellPkg/ShellPkg.dec
+        Clover/ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
         Clover/CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec

diff --git a/FileSystems/GrubFS/src/HFSPLUS.inf b/FileSystems/GrubFS/src/HFSPLUS.inf
@@ -35,7 +35,7 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        ShellPkg/ShellPkg.dec
+        Clover/ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
         Clover/CloverPkg.dec
         Clover/FileSystems/GrubFS/efifs.dec

diff --git a/FileSystems/GrubFS/src/ISO9660.inf b/FileSystems/GrubFS/src/ISO9660.inf
@@ -33,7 +33,7 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        ShellPkg/ShellPkg.dec
+        Clover/ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
         Clover/CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec

diff --git a/FileSystems/GrubFS/src/JFS.inf b/FileSystems/GrubFS/src/JFS.inf
@@ -33,7 +33,7 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        ShellPkg/ShellPkg.dec
+        Clover/ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
         Clover/CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec

diff --git a/FileSystems/GrubFS/src/MINIX.inf b/FileSystems/GrubFS/src/MINIX.inf
@@ -33,7 +33,7 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        ShellPkg/ShellPkg.dec
+        Clover/ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
         Clover/CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec

diff --git a/FileSystems/GrubFS/src/MINIX2.inf b/FileSystems/GrubFS/src/MINIX2.inf
@@ -33,7 +33,7 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        ShellPkg/ShellPkg.dec
+        Clover/ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
         Clover/CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec

diff --git a/FileSystems/GrubFS/src/MINIX2_BE.inf b/FileSystems/GrubFS/src/MINIX2_BE.inf
@@ -33,7 +33,7 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        ShellPkg/ShellPkg.dec
+        Clover/ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
         Clover/CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec

diff --git a/FileSystems/GrubFS/src/MINIX3.inf b/FileSystems/GrubFS/src/MINIX3.inf
@@ -33,7 +33,7 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        ShellPkg/ShellPkg.dec
+        Clover/ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
         Clover/CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec

diff --git a/FileSystems/GrubFS/src/MINIX3_BE.inf b/FileSystems/GrubFS/src/MINIX3_BE.inf
@@ -33,7 +33,7 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        ShellPkg/ShellPkg.dec
+        Clover/ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
         Clover/CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec

diff --git a/FileSystems/GrubFS/src/MINIX_BE.inf b/FileSystems/GrubFS/src/MINIX_BE.inf
@@ -33,7 +33,7 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        ShellPkg/ShellPkg.dec
+        Clover/ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
         Clover/CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec

diff --git a/FileSystems/GrubFS/src/NEWC.inf b/FileSystems/GrubFS/src/NEWC.inf
@@ -34,7 +34,7 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        ShellPkg/ShellPkg.dec
+        Clover/ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
         Clover/CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec

diff --git a/FileSystems/GrubFS/src/NILFS2.inf b/FileSystems/GrubFS/src/NILFS2.inf
@@ -33,7 +33,7 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        ShellPkg/ShellPkg.dec
+        Clover/ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
         Clover/CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec

diff --git a/FileSystems/GrubFS/src/NTFS.inf b/FileSystems/GrubFS/src/NTFS.inf
@@ -35,7 +35,7 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        ShellPkg/ShellPkg.dec
+        Clover/ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
         Clover/CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec

diff --git a/FileSystems/GrubFS/src/ODC.inf b/FileSystems/GrubFS/src/ODC.inf
@@ -34,7 +34,7 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        ShellPkg/ShellPkg.dec
+        Clover/ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
         Clover/CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec

diff --git a/FileSystems/GrubFS/src/PROC.inf b/FileSystems/GrubFS/src/PROC.inf
@@ -34,7 +34,7 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        ShellPkg/ShellPkg.dec
+        Clover/ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
         Clover/CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec

diff --git a/FileSystems/GrubFS/src/REISERFS.inf b/FileSystems/GrubFS/src/REISERFS.inf
@@ -33,7 +33,7 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        ShellPkg/ShellPkg.dec
+        Clover/ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
         Clover/CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec

diff --git a/FileSystems/GrubFS/src/ROMFS.inf b/FileSystems/GrubFS/src/ROMFS.inf
@@ -33,7 +33,7 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        ShellPkg/ShellPkg.dec
+        Clover/ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
         Clover/CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec

diff --git a/FileSystems/GrubFS/src/SFS.inf b/FileSystems/GrubFS/src/SFS.inf
@@ -33,7 +33,7 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        ShellPkg/ShellPkg.dec
+        Clover/ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
         Clover/CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec

diff --git a/FileSystems/GrubFS/src/SQUASH4.inf b/FileSystems/GrubFS/src/SQUASH4.inf
@@ -42,7 +42,7 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        ShellPkg/ShellPkg.dec
+        Clover/ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
         Clover/CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec

diff --git a/FileSystems/GrubFS/src/TAR.inf b/FileSystems/GrubFS/src/TAR.inf
@@ -35,7 +35,7 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        ShellPkg/ShellPkg.dec
+        Clover/ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
         Clover/CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec

diff --git a/FileSystems/GrubFS/src/UDF.inf b/FileSystems/GrubFS/src/UDF.inf
@@ -33,7 +33,7 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        ShellPkg/ShellPkg.dec
+        Clover/ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
         Clover/CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec

diff --git a/FileSystems/GrubFS/src/UFS.inf b/FileSystems/GrubFS/src/UFS.inf
@@ -33,7 +33,7 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        ShellPkg/ShellPkg.dec
+        Clover/ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
         Clover/CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec

diff --git a/FileSystems/GrubFS/src/UFS2.inf b/FileSystems/GrubFS/src/UFS2.inf
@@ -33,7 +33,7 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        ShellPkg/ShellPkg.dec
+        Clover/ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
         Clover/CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec

diff --git a/FileSystems/GrubFS/src/UFS_BE.inf b/FileSystems/GrubFS/src/UFS_BE.inf
@@ -33,7 +33,7 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        ShellPkg/ShellPkg.dec
+        Clover/ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
         Clover/CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec

diff --git a/FileSystems/GrubFS/src/XFS.inf b/FileSystems/GrubFS/src/XFS.inf
@@ -33,7 +33,7 @@
 
 [Packages]
         MdePkg/MdePkg.dec
-        ShellPkg/ShellPkg.dec
+        Clover/ShellPkg/ShellPkg.dec
         IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
         Clover/CloverPkg.dec
 	Clover/FileSystems/GrubFS/efifs.dec

diff --git a/FileSystems/GrubFS/src/ZFS.inf b/FileSystems/GrubFS/src/ZFS.inf
@@ -45,7 +45,7 @@
 
 [Packages]
       MdePkg/MdePkg.dec
-      ShellPkg/ShellPkg.dec
+      Clover/ShellPkg/ShellPkg.dec
       IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
       Clover/CloverPkg.dec
       Clover/FileSystems/GrubFS/efifs.dec

diff --git a/Patches_for_EDK2/OvmfPkg/GccBugReproducer/GccBugReproducer-O0.inf b/Patches_for_EDK2/OvmfPkg/GccBugReproducer/GccBugReproducer-O0.inf
@@ -33,7 +33,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  ShellPkg/ShellPkg.dec
+  Clover/ShellPkg/ShellPkg.dec
 
 [LibraryClasses]
   UefiLib

diff --git a/Patches_for_EDK2/OvmfPkg/GccBugReproducer/GccBugReproducer-Os.inf b/Patches_for_EDK2/OvmfPkg/GccBugReproducer/GccBugReproducer-Os.inf
@@ -33,7 +33,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  ShellPkg/ShellPkg.dec
+  Clover/ShellPkg/ShellPkg.dec
 
 [LibraryClasses]
   UefiLib

diff --git a/Patches_for_UDK2018/OvmfPkg/GccBugReproducer/GccBugReproducer-O0.inf b/Patches_for_UDK2018/OvmfPkg/GccBugReproducer/GccBugReproducer-O0.inf
@@ -33,7 +33,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  ShellPkg/ShellPkg.dec
+  Clover/ShellPkg/ShellPkg.dec
 
 [LibraryClasses]
   UefiLib

diff --git a/Patches_for_UDK2018/OvmfPkg/GccBugReproducer/GccBugReproducer-Os.inf b/Patches_for_UDK2018/OvmfPkg/GccBugReproducer/GccBugReproducer-Os.inf
@@ -33,7 +33,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  ShellPkg/ShellPkg.dec
+  Clover/ShellPkg/ShellPkg.dec
 
 [LibraryClasses]
   UefiLib

diff --git a/Protocols/DumpUefiCalls/DumpUefiCalls.c b/Protocols/DumpUefiCalls/DumpUefiCalls.c
@@ -81,7 +81,6 @@ OStartImage(
 		PRINT("ERROR: OStartImage: OpenProtocol(gEfiLoadedImageProtocolGuid) = %r\n", Status);
 		return EFI_INVALID_PARAMETER;
 	}
-
 	//
 	// Extract file path from image device file path
 	//

diff --git a/ShellPkg/Application/Shell/Shell.inf b/ShellPkg/Application/Shell/Shell.inf
@@ -51,7 +51,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  ShellPkg/ShellPkg.dec
+  Clover/ShellPkg/ShellPkg.dec
   MdeModulePkg/MdeModulePkg.dec
 
 [LibraryClasses]

diff --git a/ShellPkg/Application/ShellCTestApp/ShellCTestApp.inf b/ShellPkg/Application/ShellCTestApp/ShellCTestApp.inf
@@ -32,8 +32,8 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  ShellPkg/ShellPkg.dec
+  Clover/ShellPkg/ShellPkg.dec
 
 [LibraryClasses]
   ShellCEntryLib
-  UefiLib
+  UefiLib
diff --git a/ShellPkg/Application/ShellSortTestApp/ShellSortTestApp.inf b/ShellPkg/Application/ShellSortTestApp/ShellSortTestApp.inf
@@ -32,7 +32,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  ShellPkg/ShellPkg.dec
+  Clover/ShellPkg/ShellPkg.dec
   MdeModulePkg/MdeModulePkg.dec
 
 [LibraryClasses]