Fix compilation issues in inf files when compiled against edk2 stable tag edk2-stable201903.
Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Supreeth Venkatesh <supreeth.venkat...@arm.com> --- .../RIVL/Protocol/Udp4/Udp4/Udp4ENTSTest.inf | 31 +++++++++---------- .../Udp4ServiceBindingENTSTest.inf | 31 +++++++++---------- 2 files changed, 30 insertions(+), 32 deletions(-) diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4/Udp4ENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4/Udp4ENTSTest.inf index aedcbbcd..45a1643c 100644 --- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4/Udp4ENTSTest.inf +++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4/Udp4ENTSTest.inf @@ -2,6 +2,7 @@ # # Copyright 2006 - 2012 Unified EFI, Inc.<BR> # Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR> +# Copyright (c) 2019, ARM Ltd. All rights reserved.<BR> # # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -25,32 +26,30 @@ #--*/ [defines] +INF_VERSION = 0x00010005 BASE_NAME = Udp4_ENTSTest FILE_GUID = ADCD5DCA-FC37-4961-A31A-C93E3E802D24 COMPONENT_TYPE = BS_DRIVER +MODULE_TYPE = UEFI_DRIVER +VERSION_STRING = 1.0 +ENTRY_POINT = Udp4ENTSTestMain [sources.common] Udp4ENTSTest.c Udp4ENTSTestCase.c -[includes.common] - . - $(WORKSPACE)/SctPkg - $(WORKSPACE)/SctPkg/UEFI - $(WORKSPACE)/SctPkg/Include - $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include - $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Rivl - $(WORKSPACE)/MdePkg/Include +[Packages] + SctPkg/SctPkg.dec + SctPkg/UEFI/UEFI.dec + MdePkg/MdePkg.dec -[libraries.common] +[LibraryClasses] + UefiDriverEntryPoint SctLib - SctGuidLib EfiTestLib EntsLib - BaseDebugLibNull - CompilerIntrinsicsLib - -[nmake.common] - C_STD_INCLUDE= - IMAGE_ENTRY_POINT=Udp4ENTSTestMain +[Protocols] + gEfiEntsProtocolGuid + gBlackBoxEfiLoadedImageProtocolGuid + gBlackBoxEfiUdp4ProtocolGuid \ No newline at end of file diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4ServiceBinding/Udp4ServiceBindingENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4ServiceBinding/Udp4ServiceBindingENTSTest.inf index 78e5176f..1a315d9c 100644 --- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4ServiceBinding/Udp4ServiceBindingENTSTest.inf +++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Udp4/Udp4ServiceBinding/Udp4ServiceBindingENTSTest.inf @@ -2,6 +2,7 @@ # # Copyright 2006 - 2012 Unified EFI, Inc.<BR> # Copyright (c) 2010 - 2012, Intel Corporation. All rights reserved.<BR> +# Copyright (c) 2019, ARM Ltd. All rights reserved.<BR> # # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -25,33 +26,31 @@ #--*/ [defines] +INF_VERSION = 0x00010005 BASE_NAME = Udp4ServiceBinding_ENTSTest FILE_GUID = ADCD5DCA-FC37-4961-A31A-C93E3E802D24 COMPONENT_TYPE = BS_DRIVER +MODULE_TYPE = UEFI_DRIVER +VERSION_STRING = 1.0 +ENTRY_POINT = Udp4ServiceBindingENTSTestMain [sources.common] Udp4ServiceBindingENTSTest.c Udp4ServiceBindingENTSTestCase.h Udp4ServiceBindingENTSTestCase.c -[includes.common] - . - $(WORKSPACE)/SctPkg - $(WORKSPACE)/SctPkg/UEFI - $(WORKSPACE)/SctPkg/Include - $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/EasDispatcher/Include - $(WORKSPACE)/SctPkg/TestInfrastructure/SCT/Framework/ENTS/Rivl - $(WORKSPACE)/MdePkg/Include +[Packages] + SctPkg/SctPkg.dec + SctPkg/UEFI/UEFI.dec + MdePkg/MdePkg.dec -[libraries.common] +[LibraryClasses] + UefiDriverEntryPoint SctLib - SctGuidLib EfiTestLib EntsLib - BaseDebugLibNull - CompilerIntrinsicsLib - -[nmake.common] - C_STD_INCLUDE= - IMAGE_ENTRY_POINT=Udp4ServiceBindingENTSTestMain +[Protocols] + gEfiEntsProtocolGuid + gBlackBoxEfiLoadedImageProtocolGuid + gBlackBoxEfiUdp4ServiceBindingProtocolGuid \ No newline at end of file -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
