StdLib: Move GetPass.c out of Uefi and into PosixLib. Create LibPosix to contain all functions from PosixLib instead of individual libraries. Retains the ability to use the individual libraries, except GetPass, for backwards compatibility.

StdLib/LibC/Uefi/GetPass.c
  COPY to StdLib/PosixLib/GetPass/GetPass.c
  DELETE
StdLib/PosixLib/GetPass/GetPass.c
  NEW, COPIED from StdLib/LibC/Uefi/GetPass.c
StdLib/PosixLib/PosixLib.inf
  Create a LibPosix library class to build all PosixLib functions into a single library.
  Move GetPass from LibC/Uefi to PosixLib.inf

StdLib/LibC/Uefi/Uefi.inf
  Remove GetPass.c from sources.
  Remove IPF from VALID_ARCHITECTURES
  Update VERSION_STRING
  Align [Defines] on a two-character boundary

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Daryl McDaniel <daryl.mcdaniel@intel.com> 
Reviewed-by: Erik Bjorge <erik.c.bjorge@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15663 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Daryl McDaniel 2014-07-17 01:55:23 +00:00 committed by darylm503
parent 1b98d6ce44
commit caf89d64ff
5 changed files with 79 additions and 18 deletions

View File

@ -1,7 +1,7 @@
## @file ## @file
# Standard C library: UEFI "system calls". # Standard C library: UEFI "system calls".
# #
# Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
# #
# This program and the accompanying materials # This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # are licensed and made available under the terms and conditions of the BSD License
@ -9,21 +9,19 @@
# http://opensource.org/licenses/bsd-license.php. # http://opensource.org/licenses/bsd-license.php.
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
## ##
[Defines] [Defines]
INF_VERSION = 0x00010005 INF_VERSION = 0x00010005
BASE_NAME = LibUefi BASE_NAME = LibUefi
FILE_GUID = 1dcff17c-aa53-4b78-b234-864027555035 FILE_GUID = 1dcff17c-aa53-4b78-b234-864027555035
MODULE_TYPE = UEFI_APPLICATION MODULE_TYPE = UEFI_APPLICATION
VERSION_STRING = 1.0 VERSION_STRING = 1.05
LIBRARY_CLASS = LibUefi LIBRARY_CLASS = LibUefi
LIBRARY_DESTRUCTOR = DestructMePlease LIBRARY_DESTRUCTOR = DestructMePlease
# #
# VALID_ARCHITECTURES = IA32 X64 IPF # VALID_ARCHITECTURES = IA32 X64
# #
[Sources] [Sources]
@ -32,7 +30,6 @@
writev.c writev.c
Xform.c Xform.c
compat.c compat.c
GetPass.c
StubFunctions.c StubFunctions.c
[Packages] [Packages]

View File

@ -1,6 +1,7 @@
/** @file Implement the getpass function. /** @file
Implement the getpass function.
Copyright (c) 2011, Intel Corporation <BR> Copyright (c) 2011 - 2014, Intel Corporation <BR>
All rights reserved. This program and the accompanying materials All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at which accompanies this distribution. The full text of the license may be found at
@ -8,7 +9,6 @@
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/ **/
#include <Library/ShellLib.h> #include <Library/ShellLib.h>
@ -54,4 +54,4 @@ DestructMePlease (
SHELL_FREE_NON_NULL(ReturnStringAscii); SHELL_FREE_NON_NULL(ReturnStringAscii);
return EFI_SUCCESS; return EFI_SUCCESS;
} }

View File

@ -0,0 +1,59 @@
## @file
# Library used for supplying some POSIX routines.
#
# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved. <BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
# which accompanies this distribution. The full text of the license may be found at
# http://opensource.org/licenses/bsd-license.php
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
#
##
[Defines]
INF_VERSION = 0x00010006
BASE_NAME = LibPosix
FILE_GUID = C516673C-6C71-4F0E-83B5-57FC662376EC
MODULE_TYPE = UEFI_APPLICATION
VERSION_STRING = 1.05
LIBRARY_CLASS = LibPosix|UEFI_APPLICATION UEFI_DRIVER
#
# VALID_ARCHITECTURES = IA32 X64 EBC
#
[Sources.common]
Err/warn_err.c
Gen/dirname.c
Gen/opendir.c
Gen/closedir.c
Gen/readdir.c
Gen/access.c
Gen/utime.c
Glob/glob.c
Stringlist/stringlist.c
GetPass/GetPass.c
[Packages]
MdePkg/MdePkg.dec
StdLib/StdLib.dec
StdLibPrivateInternalFiles/DoNotUse.dec
ShellPkg/ShellPkg.dec
[LibraryClasses]
MemoryAllocationLib
ShellLib
BaseLib
LibC
LibStdio
LibStdLib
LibString

View File

@ -8,8 +8,10 @@
# #
# This package contains: # This package contains:
# Standard C Library. # Standard C Library.
# Sockets Library.
# Posix Library.
# #
# Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
# This program and the accompanying materials # This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # are licensed and made available under the terms and conditions of the BSD License
# which accompanies this distribution. The full text of the license may be found at # which accompanies this distribution. The full text of the license may be found at
@ -25,7 +27,7 @@
PLATFORM_VERSION = 0.01 PLATFORM_VERSION = 0.01
DSC_SPECIFICATION = 0x00010006 DSC_SPECIFICATION = 0x00010006
OUTPUT_DIRECTORY = Build/StdLib OUTPUT_DIRECTORY = Build/StdLib
SUPPORTED_ARCHITECTURES = IA32|IPF|X64|ARM SUPPORTED_ARCHITECTURES = IA32|X64|ARM
BUILD_TARGETS = DEBUG|RELEASE BUILD_TARGETS = DEBUG|RELEASE
SKUID_IDENTIFIER = DEFAULT SKUID_IDENTIFIER = DEFAULT
@ -129,6 +131,7 @@
StdLib/LibC/Containers/ContainerLib.inf StdLib/LibC/Containers/ContainerLib.inf
# Additional libraries for POSIX functionality. # Additional libraries for POSIX functionality.
StdLib/PosixLib/PosixLib.inf
StdLib/PosixLib/Err/LibErr.inf StdLib/PosixLib/Err/LibErr.inf
StdLib/PosixLib/Gen/LibGen.inf StdLib/PosixLib/Gen/LibGen.inf
StdLib/PosixLib/Glob/LibGlob.inf StdLib/PosixLib/Glob/LibGlob.inf

View File

@ -5,7 +5,7 @@
# The including DSC file must DEFINE the EMULATE macro if # The including DSC file must DEFINE the EMULATE macro if
# the application is to be run in an emulation environment. # the application is to be run in an emulation environment.
# #
# Copyright (c) 2011 - 2012, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
# This program and the accompanying materials # This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # are licensed and made available under the terms and conditions of the BSD License
# which accompanies this distribution. The full text of the license may be found at # which accompanies this distribution. The full text of the license may be found at
@ -50,6 +50,8 @@
LibNetUtil|StdLib/LibC/NetUtil/NetUtil.inf LibNetUtil|StdLib/LibC/NetUtil/NetUtil.inf
# Additional libraries for POSIX functionality. # Additional libraries for POSIX functionality.
LibPosix|StdLib/PosixLib/PosixLib.inf # Combines LibErr, LibGen, LibGlob, LibStringlist, GetPass into one library
LibErr|StdLib/PosixLib/Err/LibErr.inf LibErr|StdLib/PosixLib/Err/LibErr.inf
LibGen|StdLib/PosixLib/Gen/LibGen.inf LibGen|StdLib/PosixLib/Gen/LibGen.inf
LibGlob|StdLib/PosixLib/Glob/LibGlob.inf LibGlob|StdLib/PosixLib/Glob/LibGlob.inf