On 28 June 2015 at 13:39, Zeng, Star <star.z...@intel.com> wrote: > Ard, > > Any comments about the ArmVirtPkg update? >
Hello Star, I will take a good look tomorrow, and try again to build and test it. -- Ard. > Sent: Friday, June 26, 2015 10:23 PM > To: Zeng, Star > Cc: edk2-devel@lists.sourceforge.net; Ard Biesheuvel > Subject: Re: [PATCH V2 12/24] ArmVirtPkg: Link AuthVariableLib for following > merged variable driver deploy. > > On 06/26/15 16:12, Zeng, Star wrote: >> Good point, I didn't know there is ArmVirtPkg/ArmVirt.dsc.inc. >> >> Do you and Ard mind I just attach the updated V3 patches for ArmVirtPkg >> here? If yes, I can resend the whole V3 patcheset. > > Please wait a bit longer to see if Ard, Jordan, and/or others have any > comments. Then please resend (and push to github too) the entire patchset as > v3. > > In that v3 patch series, you should also include all the Reviewed-by and > Tested-by tags that you received for v2. You can do this by running "git > rebase -i", selecting the "reword" action for all the affected patches, and > then pasting the tags in question from the emails to the end of the > respective commit messages. This way your v3 will show what patches have been > already reviewed and/or tested. > > Thanks! > Laszlo > >> Anyway, thanks very much for the great comments. >> >> Star >> -----Original Message----- >> From: Laszlo Ersek [mailto:ler...@redhat.com] >> Sent: Friday, June 26, 2015 9:48 PM >> To: Zeng, Star >> Cc: edk2-devel@lists.sourceforge.net; Ard Biesheuvel >> Subject: Re: [PATCH V2 12/24] ArmVirtPkg: Link AuthVariableLib for following >> merged variable driver deploy. >> >> 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/SecureBootConfi >>> g >>> Dxe.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/DxeTpmMea >>> +surementLib.inf >>> + >>> +AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib. >>> +AuthVariableLib|i >>> +nf >>> +!else >>> + >>> +TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeas >>> +urementLibNull.inf >>> + >>> +AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariabl >>> +AuthVariableLib|e >>> +LibNull.inf >>> +!endif >>> + } >>> !endif >>> MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf >>> >>> MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.in >>> f >>> >> >> 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.in >> f >> >> 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
