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> --- .../InternetProtocol4/Ip4/Ip4ENTSTest.inf | 30 +++++++++--------- .../Ip4Config/Ip4ConfigENTSTest.inf | 31 +++++++++---------- .../Ip4Config2/Ip4Config2ENTSTest.inf | 30 +++++++++--------- .../Ip4ServiceBindingENTSTest.inf | 31 +++++++++---------- 4 files changed, 60 insertions(+), 62 deletions(-) diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4/Ip4ENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4/Ip4ENTSTest.inf index 6604f4d8..557b5c00 100644 --- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4/Ip4ENTSTest.inf +++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4/Ip4ENTSTest.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,31 @@ #--*/ [defines] +INF_VERSION = 0x00010005 BASE_NAME = Ip4_ENTSTest FILE_GUID = 9F825126-F495-4488-B784-DA04C5EC396B COMPONENT_TYPE = BS_DRIVER +MODULE_TYPE = UEFI_DRIVER +VERSION_STRING = 1.0 +ENTRY_POINT = Ip4ENTSTestMain [sources.common] Ip4ENTSTest.c Ip4ENTSTestCase.h Ip4ENTSTestCase.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=Ip4ENTSTestMain +[Protocols] + gEfiEntsProtocolGuid + gBlackBoxEfiLoadedImageProtocolGuid + gBlackBoxEfiIp4ProtocolGuid diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config/Ip4ConfigENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config/Ip4ConfigENTSTest.inf index 855ecaf9..459cf0d8 100644 --- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config/Ip4ConfigENTSTest.inf +++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config/Ip4ConfigENTSTest.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 = Ip4Config_ENTSTest FILE_GUID = 4EF1C1C2-4B2D-4e10-915C-1ECDF510FC8B COMPONENT_TYPE = BS_DRIVER +MODULE_TYPE = UEFI_DRIVER +VERSION_STRING = 1.0 +ENTRY_POINT = Ip4ConfigENTSTestMain [sources.common] Ip4ConfigENTSTest.c Ip4ConfigENTSTestCase.h Ip4ConfigENTSTestCase.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=Ip4ConfigENTSTestMain +[Protocols] + gEfiEntsProtocolGuid + gBlackBoxEfiLoadedImageProtocolGuid + gBlackBoxEfiIp4ConfigProtocolGuid \ No newline at end of file diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config2/Ip4Config2ENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config2/Ip4Config2ENTSTest.inf index f34c002d..3cb00fb9 100644 --- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config2/Ip4Config2ENTSTest.inf +++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4Config2/Ip4Config2ENTSTest.inf @@ -2,6 +2,7 @@ # # Copyright 2017 Unified EFI, Inc.<BR> # Copyright (c) 2017, 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,32 @@ #--*/ [defines] +INF_VERSION = 0x00010005 BASE_NAME = Ip4Config2_ENTSTest FILE_GUID = E58B256E-E366-4BD4-B33E-92355A69639A COMPONENT_TYPE = BS_DRIVER +MODULE_TYPE = UEFI_DRIVER +VERSION_STRING = 1.0 +ENTRY_POINT = Ip4Config2ENTSTestMain [sources.common] Ip4Config2ENTSTest.c Ip4Config2ENTSTestCase.h Ip4Config2ENTSTestCase.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=Ip4Config2ENTSTestMain +[Protocols] + gEfiEntsProtocolGuid + gBlackBoxEfiLoadedImageProtocolGuid + gBlackBoxEfiIp4Config2ProtocolGuid diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4ServiceBinding/Ip4ServiceBindingENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4ServiceBinding/Ip4ServiceBindingENTSTest.inf index e822ef47..21c2489e 100644 --- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4ServiceBinding/Ip4ServiceBindingENTSTest.inf +++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol4/Ip4ServiceBinding/Ip4ServiceBindingENTSTest.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 = Ip4ServiceBinding_ENTSTest FILE_GUID = F00F1331-AB6F-46c5-BE57-3D4C2F29EDD5 COMPONENT_TYPE = BS_DRIVER +MODULE_TYPE = UEFI_DRIVER +VERSION_STRING = 1.0 +ENTRY_POINT = Ip4ServiceBindingENTSTestMain [sources.common] Ip4ServiceBindingENTSTest.c Ip4ServiceBindingENTSTestCase.h Ip4ServiceBindingENTSTestCase.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=Ip4ServiceBindingENTSTestMain +[Protocols] + gEfiEntsProtocolGuid + gBlackBoxEfiLoadedImageProtocolGuid + gBlackBoxEfiIp4ServiceBindingProtocolGuid \ 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
