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> --- .../InternetProtocol6/Ip6/Ip6ENTSTest.inf | 32 ++++++++--------- .../Ip6Config/Ip6ConfigENTSTest.inf | 34 +++++++++---------- .../Ip6ServiceBindingENTSTest.inf | 34 +++++++++---------- 3 files changed, 47 insertions(+), 53 deletions(-) diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6/Ip6ENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6/Ip6ENTSTest.inf index a305ec1c..73a1ea53 100644 --- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6/Ip6ENTSTest.inf +++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6/Ip6ENTSTest.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,34 +26,31 @@ #--*/ [defines] +INF_VERSION = 0x00010005 BASE_NAME = Ip6_ENTSTest FILE_GUID = 22A3B176-E8B9-43b7-B130-32FE26F72739 - COMPONENT_TYPE = BS_DRIVER +MODULE_TYPE = UEFI_DRIVER +VERSION_STRING = 1.0 +ENTRY_POINT = Ip6ENTSTestMain [sources.common] Ip6ENTSTest.c Ip6ENTSTestCase.h Ip6ENTSTestCase.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=Ip6ENTSTestMain +[Protocols] + gEfiEntsProtocolGuid + gBlackBoxEfiLoadedImageProtocolGuid + gBlackBoxEfiIp6ProtocolGuid \ No newline at end of file diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6Config/Ip6ConfigENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6Config/Ip6ConfigENTSTest.inf index 7fab578c..35346661 100644 --- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6Config/Ip6ConfigENTSTest.inf +++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6Config/Ip6ConfigENTSTest.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,34 +26,31 @@ #--*/ [defines] +INF_VERSION = 0x00010005 BASE_NAME = Ip6Config_ENTSTest -FILE_GUID = 0280EF45-39FA-4437-BD41-1028531D654C - +FILE_GUID = 0280EF45-39FA-4437-BD41-1028531D654C COMPONENT_TYPE = BS_DRIVER +MODULE_TYPE = UEFI_DRIVER +VERSION_STRING = 1.0 +ENTRY_POINT = Ip6ConfigENTSTestMain [sources.common] Ip6ConfigENTSTest.c Ip6ConfigENTSTestCase.h Ip6ConfigENTSTestCase.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=Ip6ConfigENTSTestMain +[Protocols] + gEfiEntsProtocolGuid + gBlackBoxEfiLoadedImageProtocolGuid + gBlackBoxEfiIp6ConfigProtocolGuid \ No newline at end of file diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6ServiceBinding/Ip6ServiceBindingENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6ServiceBinding/Ip6ServiceBindingENTSTest.inf index b816dd24..6027e14e 100644 --- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6ServiceBinding/Ip6ServiceBindingENTSTest.inf +++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/InternetProtocol6/Ip6ServiceBinding/Ip6ServiceBindingENTSTest.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,34 +26,31 @@ #--*/ [defines] +INF_VERSION = 0x00010005 BASE_NAME = Ip6ServiceBinding_ENTSTest -FILE_GUID = D2AA81EA-1A54-4d17-B03D-719F5C60A6EC - +FILE_GUID = D2AA81EA-1A54-4d17-B03D-719F5C60A6EC COMPONENT_TYPE = BS_DRIVER +MODULE_TYPE = UEFI_DRIVER +VERSION_STRING = 1.0 +ENTRY_POINT = Ip6ServiceBindingENTSTestMain [sources.common] Ip6ServiceBindingENTSTest.c Ip6ServiceBindingENTSTestCase.h Ip6ServiceBindingENTSTestCase.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=Ip6ServiceBindingENTSTestMain +[Protocols] + gEfiEntsProtocolGuid + gBlackBoxEfiLoadedImageProtocolGuid + gBlackBoxEfiIp6ServiceBindingProtocolGuid \ 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
