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> --- .../Protocol/Dhcp6/Dhcp6/Dhcp6ENTSTest.inf | 31 +++++++++---------- .../Dhcp6/Dhcp6SB/Dhcp6SBENTSTest.inf | 30 +++++++++--------- 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6/Dhcp6ENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6/Dhcp6ENTSTest.inf index f996834b..08ee3aa1 100644 --- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6/Dhcp6ENTSTest.inf +++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6/Dhcp6ENTSTest.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 = Dhcp6_ENTSTest FILE_GUID = E04ABBDD-135B-48db-9196-FBBE9EC48B75 COMPONENT_TYPE = BS_DRIVER +MODULE_TYPE = UEFI_DRIVER +VERSION_STRING = 1.0 +ENTRY_POINT = Dhcp6ENTSTestMain [sources.common] Dhcp6ENTSTest.c Dhcp6ENTSTestCase.c -[includes.common] - . - ./Include - $(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=Dhcp6ENTSTestMain +[Protocols] + gEfiEntsProtocolGuid + gBlackBoxEfiLoadedImageProtocolGuid + gBlackBoxEfiDhcp6ProtocolGuid diff --git a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6SB/Dhcp6SBENTSTest.inf b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6SB/Dhcp6SBENTSTest.inf index d64c912c..9ade3c4e 100644 --- a/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6SB/Dhcp6SBENTSTest.inf +++ b/uefi-sct/SctPkg/TestCase/RIVL/Protocol/Dhcp6/Dhcp6SB/Dhcp6SBENTSTest.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,31 +26,30 @@ #--*/ [defines] +INF_VERSION = 0x00010005 BASE_NAME = Dhcp6SB_ENTSTest FILE_GUID = BCA42DFB-69BA-45da-A0D8-FCB8A6129E42 COMPONENT_TYPE = BS_DRIVER +MODULE_TYPE = UEFI_DRIVER +VERSION_STRING = 1.0 +ENTRY_POINT = Dhcp6SBENTSTestMain [sources.common] Dhcp6SBENTSTest.c Dhcp6SBENTSTestCase.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=Dhcp6SBENTSTestMain +[Protocols] + gEfiEntsProtocolGuid + gBlackBoxEfiLoadedImageProtocolGuid + gBlackBoxEfiDhcp6ServiceBindingProtocolGuid \ 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
