Hi Laszlo, I think I revert all the changes in all these files. I modified them because I moved CreateTimeBasedPayload() to SecureBootVariableLib library, but it created incorrect dependency on SecurityPkg from MdeModulePkg. Anyway it needs another solution please check https://edk2.groups.io/g/devel/message/76800 for details. thanks, greg
wt., 22 cze 2021 o 13:11 Laszlo Ersek <ler...@redhat.com> napisaĆ(a): > > Hi Grzegorz, > > On 06/14/21 11:43, Grzegorz Bernacki wrote: > > Update platform files to add SecureBootVariableLib for each > > platform which uses SecureBootConfigDxe. > > > > Signed-off-by: Grzegorz Bernacki <g...@semihalf.com> > > --- > > ArmVirtPkg/ArmVirtQemu.dsc | 3 +++ > > ArmVirtPkg/ArmVirtQemuKernel.dsc | 3 +++ > > EmulatorPkg/EmulatorPkg.dsc | 1 + > > OvmfPkg/Bhyve/BhyveX64.dsc | 1 + > > OvmfPkg/OvmfPkgIa32.dsc | 1 + > > OvmfPkg/OvmfPkgIa32X64.dsc | 1 + > > OvmfPkg/OvmfPkgX64.dsc | 1 + > > 7 files changed, 11 insertions(+) > > please split this patch in three (one patch per package), and assign > according subject lines to those patches as well. > > I had some difficulties determining what I should look at in this patch > set at all (the subject in particular is unhelpful). > > Thanks, > Laszlo > > > > > > diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc > > index 7ef5e7297b..c9cb0ff4ae 100644 > > --- a/ArmVirtPkg/ArmVirtQemu.dsc > > +++ b/ArmVirtPkg/ArmVirtQemu.dsc > > @@ -82,6 +82,9 @@ > > > > PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf > > > > PciHostBridgeUtilityLib|OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.inf > > > > +!if $(SECURE_BOOT_ENABLE) == TRUE > > + > > SecureBootVariableLib|SecurityPkg/Library/SecureBootVariableLib/SecureBootVariableLib.inf > > +!endif > > !if $(TPM2_ENABLE) == TRUE > > Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf > > > > Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeTcg2PhysicalPresenceLib.inf > > diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc > > b/ArmVirtPkg/ArmVirtQemuKernel.dsc > > index a542fcb157..97b36e895e 100644 > > --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc > > +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc > > @@ -81,6 +81,9 @@ > > > > PciHostBridgeUtilityLib|OvmfPkg/Library/PciHostBridgeUtilityLib/PciHostBridgeUtilityLib.inf > > > > TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf > > > > +!if $(SECURE_BOOT_ENABLE) == TRUE > > + > > SecureBootVariableLib|SecurityPkg/Library/SecureBootVariableLib/SecureBootVariableLib.inf > > +!endif > > [LibraryClasses.common.DXE_DRIVER] > > > > ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf > > > > diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc > > index 20e5468398..966cc7af01 100644 > > --- a/EmulatorPkg/EmulatorPkg.dsc > > +++ b/EmulatorPkg/EmulatorPkg.dsc > > @@ -132,6 +132,7 @@ > > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf > > > > PlatformSecureLib|SecurityPkg/Library/PlatformSecureLibNull/PlatformSecureLibNull.inf > > AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf > > + > > SecureBootVariableLib|SecurityPkg/Library/SecureBootVariableLib/SecureBootVariableLib.inf > > !else > > > > AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf > > !endif > > diff --git a/OvmfPkg/Bhyve/BhyveX64.dsc b/OvmfPkg/Bhyve/BhyveX64.dsc > > index d8792812ab..f9c8131309 100644 > > --- a/OvmfPkg/Bhyve/BhyveX64.dsc > > +++ b/OvmfPkg/Bhyve/BhyveX64.dsc > > @@ -198,6 +198,7 @@ > > !if $(SECURE_BOOT_ENABLE) == TRUE > > > > PlatformSecureLib|OvmfPkg/Bhyve/Library/PlatformSecureLib/PlatformSecureLib.inf > > AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf > > + > > SecureBootVariableLib|SecurityPkg/Library/SecureBootVariableLib/SecureBootVariableLib.inf > > !else > > > > AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf > > !endif > > diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc > > index f53efeae79..9225966541 100644 > > --- a/OvmfPkg/OvmfPkgIa32.dsc > > +++ b/OvmfPkg/OvmfPkgIa32.dsc > > @@ -204,6 +204,7 @@ > > !if $(SECURE_BOOT_ENABLE) == TRUE > > PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf > > AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf > > + > > SecureBootVariableLib|SecurityPkg/Library/SecureBootVariableLib/SecureBootVariableLib.inf > > !else > > > > AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf > > !endif > > diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc > > index b3662e17f2..5d53327edb 100644 > > --- a/OvmfPkg/OvmfPkgIa32X64.dsc > > +++ b/OvmfPkg/OvmfPkgIa32X64.dsc > > @@ -208,6 +208,7 @@ > > !if $(SECURE_BOOT_ENABLE) == TRUE > > PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf > > AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf > > + > > SecureBootVariableLib|SecurityPkg/Library/SecureBootVariableLib/SecureBootVariableLib.inf > > !else > > > > AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf > > !endif > > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc > > index 0a237a9058..509acf7926 100644 > > --- a/OvmfPkg/OvmfPkgX64.dsc > > +++ b/OvmfPkg/OvmfPkgX64.dsc > > @@ -208,6 +208,7 @@ > > !if $(SECURE_BOOT_ENABLE) == TRUE > > PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf > > AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf > > + > > SecureBootVariableLib|SecurityPkg/Library/SecureBootVariableLib/SecureBootVariableLib.inf > > !else > > > > AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf > > !endif > > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#76832): https://edk2.groups.io/g/devel/message/76832 Mute This Topic: https://groups.io/mt/83526316/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-