REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2940
TpmMeasurementLib includes DxeTpmMeasurementLib and PeiTpmMeasurementLib. So need to change TpmMeasurementLibNull to BASE library to avoid build error in some platform. Signed-off-by: Qi Zhang <qi1.zh...@intel.com> Cc: Jian J Wang <jian.j.w...@intel.com> Cc: Hao A Wu <hao.a...@intel.com> Cc: Jiewen Yao <jiewen....@intel.com> --- .../Library/TpmMeasurementLibNull/TpmMeasurementLibNull.c | 4 +++- .../Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.c b/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.c index b9c5b68de8..ee3be62fc6 100644 --- a/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.c +++ b/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.c @@ -1,11 +1,13 @@ /** @file This library is used by other modules to measure data to TPM. -Copyright (c) 2015, Intel Corporation. All rights reserved. <BR> +Copyright (c) 2015-2020, Intel Corporation. All rights reserved. <BR> SPDX-License-Identifier: BSD-2-Clause-Patent **/ +#include <Uefi/UefiBaseType.h> + /** Tpm measure and log data, and extend the measurement result into a specific PCR. diff --git a/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf b/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf index 61abcfa2ec..1db2c0d6a7 100644 --- a/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf +++ b/MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf @@ -1,7 +1,7 @@ ## @file # Provides NULL TPM measurement function. # -# Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR> +# Copyright (c) 2015 - 2020, Intel Corporation. All rights reserved.<BR> # SPDX-License-Identifier: BSD-2-Clause-Patent # ## @@ -10,9 +10,9 @@ INF_VERSION = 0x00010005 BASE_NAME = TpmMeasurementLibNull FILE_GUID = 6DFD6E9F-9278-48D8-8F45-B6CFF2C2B69C - MODULE_TYPE = UEFI_DRIVER + MODULE_TYPE = BASE VERSION_STRING = 1.0 - LIBRARY_CLASS = TpmMeasurementLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER + LIBRARY_CLASS = TpmMeasurementLib MODULE_UNI_FILE = TpmMeasurementLibNull.uni # -- 2.26.2.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#64728): https://edk2.groups.io/g/devel/message/64728 Mute This Topic: https://groups.io/mt/76468437/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
