SecurityPkg/VariableAuthenticated/Pei/VariablePei.inf doesn't consume BaseCryptLib directly or indirectly, cleanup it. SecurityPkg/VariableAuthenticated/Pei/VariablePei.inf { <LibraryClasses> BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf }
BaseCryptLib has been declared at [LibraryClasses.common.DXE_RUNTIME_DRIVER] section in ArmVirt.dsc.inc. OpensslLib has been declared at [LibraryClasses.common] section in ArmVirt.dsc.inc. So cleanup them. SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf { <LibraryClasses> BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf } Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Star Zeng <star.z...@intel.com> Reviewed-by: Laszlo Ersek <ler...@redhat.com> Reviewed-by: Ard Biesheuvel <ard.biesheu...@linaro.org> Tested-by: Ard Biesheuvel <ard.biesheu...@linaro.org> --- ArmVirtPkg/ArmVirtQemu.dsc | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 374cf7a..d8eb796 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -1,6 +1,7 @@ # # Copyright (c) 2011-2015, ARM Limited. All rights reserved. # Copyright (c) 2014, Linaro Limited. All rights reserved. +# Copyright (c) 2015, Intel Corporation. All rights reserved. # # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -239,10 +240,7 @@ [Components.common] ArmPkg/Drivers/CpuPei/CpuPei.inf !if $(SECURE_BOOT_ENABLE) == TRUE - SecurityPkg/VariableAuthenticated/Pei/VariablePei.inf { - <LibraryClasses> - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf - } + SecurityPkg/VariableAuthenticated/Pei/VariablePei.inf !else MdeModulePkg/Universal/Variable/Pei/VariablePei.inf !endif @@ -271,11 +269,7 @@ [Components.common] <LibraryClasses> NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf } - SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf { - <LibraryClasses> - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf - } + SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf !else MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf -- 1.9.5.msysgit.0 ------------------------------------------------------------------------------ Don't Limit Your Business. Reach for the Cloud. GigeNET's Cloud Solutions provide you with the tools and support that you need to offload your IT needs and focus on growing your business. Configured For All Businesses. Start Your Cloud Today. https://www.gigenetcloud.com/ _______________________________________________ edk2-devel mailing list edk2-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/edk2-devel