summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaszlo Ersek <lersek@redhat.com>2015-01-14 16:25:48 +0000
committerlersek <lersek@Edk2>2015-01-14 16:25:48 +0000
commit3fe23dc606d19a13c8407d624678d6834b08b344 (patch)
tree6c05d075fb5d152d1eb82eca9a87ae4238965568
parent6a013e50b3f63598e07030325d9469e2444a17a6 (diff)
downloadedk2-platforms-3fe23dc606d19a13c8407d624678d6834b08b344.tar.xz
ShellPkg: UefiShellLib: drop wrong PathLib library class dependency
SVN r16601 ("MdeModulePkg, MdePkg, NetworkPkg, OvmfPkg, PerformancePkg, ShellPkg: Library Migration.") incorporated ShellPkg/Library/BasePathLib into MdePkg/Library/BaseLib. BasePathLib had been the only instance of library class PathLib. Even so, SVN r16606 ("ShellPkg: allow creating of files to create required directory path") added a PathLib dependency to "ShellPkg/Library/UefiShellLib/UefiShellLib.inf". This breaks edk2 platforms that build the "new" UEFI shell from source. Undo the wrong dependency. Similarly, update the <Library/PathLib.h> #include directive to <Library/BaseLib.h> (example function prototype: PathRemoveLastItem()). Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Jaben Carsey <jaben.carsey@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16609 6f19259b-4bc3-4df7-8a09-765794883524
-rw-r--r--ShellPkg/Library/UefiShellLib/UefiShellLib.c2
-rw-r--r--ShellPkg/Library/UefiShellLib/UefiShellLib.inf1
2 files changed, 1 insertions, 2 deletions
diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.c b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
index 844f17abc6..da4b46616f 100644
--- a/ShellPkg/Library/UefiShellLib/UefiShellLib.c
+++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
@@ -15,7 +15,7 @@
#include "UefiShellLib.h"
#include <ShellBase.h>
#include <Library/SortLib.h>
-#include <Library/PathLib.h>
+#include <Library/BaseLib.h>
#define FIND_XXXXX_FILE_BUFFER_SIZE (SIZE_OF_EFI_FILE_INFO + MAX_FILE_NAME_LEN)
diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.inf b/ShellPkg/Library/UefiShellLib/UefiShellLib.inf
index da06c34884..8eedfce8b6 100644
--- a/ShellPkg/Library/UefiShellLib/UefiShellLib.inf
+++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.inf
@@ -48,7 +48,6 @@
UefiLib
HiiLib
SortLib
- PathLib
[Protocols]
gEfiSimpleFileSystemProtocolGuid # ALWAYS_CONSUMED