From 6a013e50b3f63598e07030325d9469e2444a17a6 Mon Sep 17 00:00:00 2001 From: Daryl McDaniel Date: Tue, 13 Jan 2015 23:35:33 +0000 Subject: [PATCH] StdLib: Move libraries from ShellPkg into MdeModulePkg and MdePkg. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The following libraries are being migrated out of ShellPkg in order to make their functionality more widely available. • PathLib: Incorporate into MdePkg/Library/BaseLib • FileHandleLib: MdePkg/Library/UefiFileHandleLib • BaseSortLib: MdeModulePkg/Library/BaseSortLib • UefiSortLib: MdeModulePkg/Library/UefiSortLib AppPkg.dsc: StdLib.dsc: StdLib.inc: Delete PathLib LibraryClass description. Update FileHandleLib LibraryClass description to reflect its new location. Update SortLib LibraryClass description to reflect its new location. StdLib.inf: Delete PathLib from LibraryClasses. realpath.c: Delete include of PathLib.h. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Daryl McDaniel Reviewed-by: Jaben Carsey Reviewed-by: Lee Rosenbaum git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16608 6f19259b-4bc3-4df7-8a09-765794883524 --- AppPkg/AppPkg.dsc | 5 ++--- StdLib/LibC/StdLib/StdLib.inf | 1 - StdLib/LibC/StdLib/realpath.c | 1 - StdLib/StdLib.dsc | 7 +++---- StdLib/StdLib.inc | 5 ++--- 5 files changed, 7 insertions(+), 12 deletions(-) diff --git a/AppPkg/AppPkg.dsc b/AppPkg/AppPkg.dsc index 424434c0c8..6db32a177d 100644 --- a/AppPkg/AppPkg.dsc +++ b/AppPkg/AppPkg.dsc @@ -78,11 +78,10 @@ UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf + FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf + SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf - FileHandleLib|ShellPkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf - SortLib|ShellPkg/Library/UefiSortLib/UefiSortLib.inf - PathLib|ShellPkg/Library/BasePathLib/BasePathLib.inf CacheMaintenanceLib|MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf diff --git a/StdLib/LibC/StdLib/StdLib.inf b/StdLib/LibC/StdLib/StdLib.inf index ce1c3052cb..ffc54b562e 100644 --- a/StdLib/LibC/StdLib/StdLib.inf +++ b/StdLib/LibC/StdLib/StdLib.inf @@ -55,7 +55,6 @@ LibC LibCType LibSignal - PathLib ################################################################ # diff --git a/StdLib/LibC/StdLib/realpath.c b/StdLib/LibC/StdLib/realpath.c index a7186184c9..6d75f17a39 100644 --- a/StdLib/LibC/StdLib/realpath.c +++ b/StdLib/LibC/StdLib/realpath.c @@ -13,7 +13,6 @@ #include #include #include -#include #include /** The realpath() function shall derive, from the pathname pointed to by diff --git a/StdLib/StdLib.dsc b/StdLib/StdLib.dsc index 43bd3e2cd7..c2842ce166 100644 --- a/StdLib/StdLib.dsc +++ b/StdLib/StdLib.dsc @@ -77,14 +77,13 @@ PciCf8Lib|MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.inf SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf + HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf + FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf - HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf + SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf - FileHandleLib|ShellPkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf - SortLib|ShellPkg/Library/UefiSortLib/UefiSortLib.inf - PathLib|ShellPkg/Library/BasePathLib/BasePathLib.inf ################################################################################################### # diff --git a/StdLib/StdLib.inc b/StdLib/StdLib.inc index 4c34905555..1b7fcf0bae 100644 --- a/StdLib/StdLib.inc +++ b/StdLib/StdLib.inc @@ -26,9 +26,8 @@ [LibraryClasses.Common.UEFI_APPLICATION] ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf - FileHandleLib|ShellPkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf - SortLib|ShellPkg/Library/UefiSortLib/UefiSortLib.inf - PathLib|ShellPkg/Library/BasePathLib/BasePathLib.inf + FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf + SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf ShellCEntryLib|ShellPkg/Library/UefiShellCEntryLib/UefiShellCEntryLib.inf # -- 2.39.2