Skip to content

Commit

Permalink
Updated line endings in specific .inf files that were failing CI. Add…
Browse files Browse the repository at this point in the history
…ed Tcg2AcpiFfa.inf to the SecurityPkg.dsc as it was failing in CI as well.
  • Loading branch information
Raymond-MS committed Dec 5, 2024
1 parent 44776b8 commit 49baca0
Show file tree
Hide file tree
Showing 11 changed files with 303 additions and 299 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
MdeModulePkg/MdeModulePkg.dec
SecurityPkg/SecurityPkg.dec
CryptoPkg/CryptoPkg.dec
FmpDevicePkg/FmpDevicePkg.dec ## MU_CHANGE
FmpDevicePkg/FmpDevicePkg.dec ## MU_CHANGE

[LibraryClasses]
BaseLib
Expand All @@ -40,8 +40,8 @@
MemoryAllocationLib
BaseCryptLib

[Pcd]
gFmpDevicePkgTokenSpaceGuid.PcdFmpDxeRequiredEKU ## CONSUMES ## MU_CHANGE

[Pcd]
gFmpDevicePkgTokenSpaceGuid.PcdFmpDxeRequiredEKU ## CONSUMES ## MU_CHANGE
[Guids]
gEfiCertPkcs7Guid ## CONSUMES ## GUID
68 changes: 34 additions & 34 deletions SecurityPkg/Library/OemTpm2InitLibNull/OemTpm2InitLib.inf
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
## @file OemTpm2InitLib.inf
# Shared library for common TPM 2.0 init routines.
# Mostly TPM 2.0 disablement features.
#
# @copyright
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
# @par Specification Reference:
#
##


[Defines]
INF_VERSION = 0x00010017
BASE_NAME = OemTpm2InitLibNull
FILE_GUID = 11A600C7-2B83-4AC4-9B50-E2B0502704AA
VERSION_STRING = 1.0
MODULE_TYPE = BASE
LIBRARY_CLASS = OemTpm2InitLib

#
# The following information is for reference only and not required by the build tools.
#
# VALID_ARCHITECTURES = IA32 X64
#


[Sources]
OemTpm2InitLib.c


[Packages]
MdePkg/MdePkg.dec
## @file OemTpm2InitLib.inf
# Shared library for common TPM 2.0 init routines.
# Mostly TPM 2.0 disablement features.
#
# @copyright
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
# @par Specification Reference:
#
##
[Defines]
INF_VERSION = 0x00010017
BASE_NAME = OemTpm2InitLibNull
FILE_GUID = 11A600C7-2B83-4AC4-9B50-E2B0502704AA
VERSION_STRING = 1.0
MODULE_TYPE = BASE
LIBRARY_CLASS = OemTpm2InitLib
#
# The following information is for reference only and not required by the build tools.
#
# VALID_ARCHITECTURES = IA32 X64
#
[Sources]
OemTpm2InitLib.c
[Packages]
MdePkg/MdePkg.dec
74 changes: 37 additions & 37 deletions SecurityPkg/Library/OemTpm2InitLibNull/OemTpm2InitLibVendorNull.inf
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
## @file OemTpm2InitLibVendorNull.inf
#
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
# This is an null version of the vendor-specific lib that can be used
# for TPM parts that don't require an special initialization.
#
##


[Defines]
INF_VERSION = 0x00010017
BASE_NAME = OemTpm2InitLibVendorNull
FILE_GUID = D90742CF-A613-44B2-9526-6E8DB751CE00
VERSION_STRING = 1.0
MODULE_TYPE = BASE
LIBRARY_CLASS = OemTpm2InitLibVendor

#
# The following information is for reference only and not required by the build tools.
#
# VALID_ARCHITECTURES = IA32 X64
#


[Sources]
OemTpm2InitLibVendorNull.c


[Packages]
MdePkg/MdePkg.dec
SecurityPkg/SecurityPkg.dec


[LibraryClasses]

## @file OemTpm2InitLibVendorNull.inf
#
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
# This is an null version of the vendor-specific lib that can be used
# for TPM parts that don't require an special initialization.
#
##
[Defines]
INF_VERSION = 0x00010017
BASE_NAME = OemTpm2InitLibVendorNull
FILE_GUID = D90742CF-A613-44B2-9526-6E8DB751CE00
VERSION_STRING = 1.0
MODULE_TYPE = BASE
LIBRARY_CLASS = OemTpm2InitLibVendor
#
# The following information is for reference only and not required by the build tools.
#
# VALID_ARCHITECTURES = IA32 X64
#
[Sources]
OemTpm2InitLibVendorNull.c
[Packages]
MdePkg/MdePkg.dec
SecurityPkg/SecurityPkg.dec
[LibraryClasses]
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
## @file Tcg2PhysicalPresencePromptLibConsole.inf
# This instance of the Tcg2PhysicalPresencePromptLib uses the console and basic key input
# to prompt the user.
#
##
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: BSD-2-Clause-Patent
##

[Defines]
INF_VERSION = 0x00010017
BASE_NAME = Tcg2PhysicalPresencePromptLibConsole
FILE_GUID = 54A17646-E8E3-4BED-A7D8-D9E5E7684E85
VERSION_STRING = 1.0
MODULE_TYPE = DXE_DRIVER
LIBRARY_CLASS = Tcg2PhysicalPresencePromptLib|DXE_DRIVER

#
# The following information is for reference only and not required by the build tools.
#
# VALID_ARCHITECTURES = IA32 X64
#


[Sources]
Tcg2PhysicalPresencePromptLibConsole.c


[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec


[LibraryClasses]
BaseLib
UefiLib
UefiBootServicesTableLib
## @file Tcg2PhysicalPresencePromptLibConsole.inf
# This instance of the Tcg2PhysicalPresencePromptLib uses the console and basic key input
# to prompt the user.
#
##
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: BSD-2-Clause-Patent
##
[Defines]
INF_VERSION = 0x00010017
BASE_NAME = Tcg2PhysicalPresencePromptLibConsole
FILE_GUID = 54A17646-E8E3-4BED-A7D8-D9E5E7684E85
VERSION_STRING = 1.0
MODULE_TYPE = DXE_DRIVER
LIBRARY_CLASS = Tcg2PhysicalPresencePromptLib|DXE_DRIVER
#
# The following information is for reference only and not required by the build tools.
#
# VALID_ARCHITECTURES = IA32 X64
#
[Sources]
Tcg2PhysicalPresencePromptLibConsole.c
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
[LibraryClasses]
BaseLib
UefiLib
UefiBootServicesTableLib
70 changes: 35 additions & 35 deletions SecurityPkg/Library/Tpm2DebugLib/Tpm2DebugLibNull.inf
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
## @file Tpm2DebugLibNull.inf
# This file contains helper functions to do nothing.
#
##
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##


[Defines]
INF_VERSION = 0x00010017
BASE_NAME = Tpm2DebugLibNull
FILE_GUID = 97a27b03-286f-4237-a7c3-a09a1b6e6e2d
MODULE_TYPE = BASE
VERSION_STRING = 1.0
LIBRARY_CLASS = Tpm2DebugLib

#
# The following information is for reference only and not required by the build tools.
#
# VALID_ARCHITECTURES = IA32 X64
#


[Sources]
Tpm2DebugLibNull.c


[Packages]
MdePkg/MdePkg.dec


[LibraryClasses]
DebugLib
## @file Tpm2DebugLibNull.inf
# This file contains helper functions to do nothing.
#
##
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
[Defines]
INF_VERSION = 0x00010017
BASE_NAME = Tpm2DebugLibNull
FILE_GUID = 97a27b03-286f-4237-a7c3-a09a1b6e6e2d
MODULE_TYPE = BASE
VERSION_STRING = 1.0
LIBRARY_CLASS = Tpm2DebugLib
#
# The following information is for reference only and not required by the build tools.
#
# VALID_ARCHITECTURES = IA32 X64
#
[Sources]
Tpm2DebugLibNull.c
[Packages]
MdePkg/MdePkg.dec
[LibraryClasses]
DebugLib
72 changes: 36 additions & 36 deletions SecurityPkg/Library/Tpm2DebugLib/Tpm2DebugLibSimple.inf
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
## @file Tpm2DebugLibSimple.inf
# This file contains helper functions to perform a simple debugging of
# TPM transactions as they go to and from the TPM device.
#
##
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##


[Defines]
INF_VERSION = 0x00010017
BASE_NAME = Tpm2DebugLibSimple
FILE_GUID = d48907a4-5b42-425a-b6d3-046d31c09b7b
MODULE_TYPE = BASE
VERSION_STRING = 1.0
LIBRARY_CLASS = Tpm2DebugLib

#
# The following information is for reference only and not required by the build tools.
#
# VALID_ARCHITECTURES = IA32 X64
#


[Sources]
Tpm2DebugLibSimple.c


[Packages]
MdePkg/MdePkg.dec


[LibraryClasses]
DebugLib
## @file Tpm2DebugLibSimple.inf
# This file contains helper functions to perform a simple debugging of
# TPM transactions as they go to and from the TPM device.
#
##
# Copyright (c) Microsoft Corporation.
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
[Defines]
INF_VERSION = 0x00010017
BASE_NAME = Tpm2DebugLibSimple
FILE_GUID = d48907a4-5b42-425a-b6d3-046d31c09b7b
MODULE_TYPE = BASE
VERSION_STRING = 1.0
LIBRARY_CLASS = Tpm2DebugLib
#
# The following information is for reference only and not required by the build tools.
#
# VALID_ARCHITECTURES = IA32 X64
#
[Sources]
Tpm2DebugLibSimple.c
[Packages]
MdePkg/MdePkg.dec
[LibraryClasses]
DebugLib
Loading

0 comments on commit 49baca0

Please sign in to comment.