comments below

On 06/26/15 10:37, Star Zeng wrote:
> Link AuthVariableLib and DxeTpmMeasurementLib in SecurityPkg
> when SECURE_BOOT_ENABLE = TRUE.
> Link AuthVariableLibNull and TpmMeasurementLibNull in MdeModulePkg
> when SECURE_BOOT_ENABLE = FALSE.
> 
> Cc: Laszlo Ersek <ler...@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheu...@linaro.org>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Star Zeng <star.z...@intel.com>
> ---
>  ArmVirtPkg/ArmVirtQemu.dsc | 12 +++++++++++-
>  1 file changed, 11 insertions(+), 1 deletion(-)
> 
> diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
> index 374cf7a..b49389c 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
> @@ -279,7 +280,16 @@
>    
> SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf
>  !else
>    MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf
> -  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
> +  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf {
> +    <LibraryClasses>
> +!if $(SECURE_BOOT_ENABLE) == TRUE
> +      
> TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf
> +      AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf
> +!else
> +      
> TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
> +      
> AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
> +!endif
> +  }
>  !endif
>    MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
>    MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
> 

Please do not modify the "ArmVirtQemu.dsc" file in this patch.

Instead, please effect the equivalent change in
"ArmVirtPkg/ArmVirt.dsc.inc". That file already resolves
"TpmMeasurementLib" for the secure boot case, identically to the above
resolution.

Therefore, similarly to the corresponding OvmfPkg patch, please add the

  AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf

resolution in "ArmVirtPkg/ArmVirt.dsc.inc", to the existing "!if"
branch, and introduce the Null resolutions (for TpmMeasurementLib and
AuthVariableLib) in a new "!else" branch. "ArmVirtQemu.dsc" should not
be modified.

Thanks!
Laszlo

------------------------------------------------------------------------------
Monitor 25 network devices or servers for free with OpManager!
OpManager is web-based network management software that monitors 
network devices and physical & virtual servers, alerts via email & sms 
for fault. Monitor 25 devices for free with no restriction. Download now
http://ad.doubleclick.net/ddm/clk/292181274;119417398;o
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/edk2-devel

Reply via email to