* [PATCH 1/1] OvmfPkg: fix OvmfTpmSecurityStub.dsc.inc include
@ 2023-01-12 15:41 Gerd Hoffmann
2023-01-13 8:32 ` Yao, Jiewen
[not found] ` <1739D137612FA4DE.25137@groups.io>
0 siblings, 2 replies; 3+ messages in thread
From: Gerd Hoffmann @ 2023-01-12 15:41 UTC (permalink / raw)
To: devel
Cc: Gerd Hoffmann, Jordan Justen, Oliver Steffen, Sebastien Boeuf,
Pawel Polawski, Ard Biesheuvel, Jiewen Yao
TPM support is independent from secure boot support. Move the TPM
include snipped out of the secure boot !if block.
Fixes: b47575801e19 ("OvmfPkg: move tcg configuration to dsc and fdf include files")
Bugzilla: https://bugzilla.tianocore.org//show_bug.cgi?id=4290
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
OvmfPkg/CloudHv/CloudHvX64.dsc | 2 +-
OvmfPkg/Microvm/MicrovmX64.dsc | 2 +-
OvmfPkg/OvmfPkgX64.dsc | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc
index 03b7a5cc6b64..7326417eab62 100644
--- a/OvmfPkg/CloudHv/CloudHvX64.dsc
+++ b/OvmfPkg/CloudHv/CloudHvX64.dsc
@@ -716,8 +716,8 @@ [Components]
<LibraryClasses>
!if $(SECURE_BOOT_ENABLE) == TRUE
NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf
+!endif
!include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
-!endif
}
MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc
index d5bdcbb9835c..2d53b5c2950d 100644
--- a/OvmfPkg/Microvm/MicrovmX64.dsc
+++ b/OvmfPkg/Microvm/MicrovmX64.dsc
@@ -705,8 +705,8 @@ [Components]
<LibraryClasses>
!if $(SECURE_BOOT_ENABLE) == TRUE
NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf
+!endif
!include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
-!endif
}
MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index 8401d7390005..3f970a79a08a 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -805,8 +805,8 @@ [Components]
<LibraryClasses>
!if $(SECURE_BOOT_ENABLE) == TRUE
NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf
+!endif
!include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
-!endif
}
MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
--
2.39.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] OvmfPkg: fix OvmfTpmSecurityStub.dsc.inc include
2023-01-12 15:41 [PATCH 1/1] OvmfPkg: fix OvmfTpmSecurityStub.dsc.inc include Gerd Hoffmann
@ 2023-01-13 8:32 ` Yao, Jiewen
[not found] ` <1739D137612FA4DE.25137@groups.io>
1 sibling, 0 replies; 3+ messages in thread
From: Yao, Jiewen @ 2023-01-13 8:32 UTC (permalink / raw)
To: Gerd Hoffmann, devel@edk2.groups.io
Cc: Justen, Jordan L, Oliver Steffen, Boeuf, Sebastien,
Pawel Polawski, Ard Biesheuvel
Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>
> -----Original Message-----
> From: Gerd Hoffmann <kraxel@redhat.com>
> Sent: Thursday, January 12, 2023 11:41 PM
> To: devel@edk2.groups.io
> Cc: Gerd Hoffmann <kraxel@redhat.com>; Justen, Jordan L
> <jordan.l.justen@intel.com>; Oliver Steffen <osteffen@redhat.com>; Boeuf,
> Sebastien <sebastien.boeuf@intel.com>; Pawel Polawski
> <ppolawsk@redhat.com>; Ard Biesheuvel <ardb+tianocore@kernel.org>;
> Yao, Jiewen <jiewen.yao@intel.com>
> Subject: [PATCH 1/1] OvmfPkg: fix OvmfTpmSecurityStub.dsc.inc include
>
> TPM support is independent from secure boot support. Move the TPM
> include snipped out of the secure boot !if block.
>
> Fixes: b47575801e19 ("OvmfPkg: move tcg configuration to dsc and fdf
> include files")
> Bugzilla: https://bugzilla.tianocore.org//show_bug.cgi?id=4290
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
> OvmfPkg/CloudHv/CloudHvX64.dsc | 2 +-
> OvmfPkg/Microvm/MicrovmX64.dsc | 2 +-
> OvmfPkg/OvmfPkgX64.dsc | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc
> b/OvmfPkg/CloudHv/CloudHvX64.dsc
> index 03b7a5cc6b64..7326417eab62 100644
> --- a/OvmfPkg/CloudHv/CloudHvX64.dsc
> +++ b/OvmfPkg/CloudHv/CloudHvX64.dsc
> @@ -716,8 +716,8 @@ [Components]
> <LibraryClasses>
> !if $(SECURE_BOOT_ENABLE) == TRUE
>
> NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.i
> nf
> +!endif
> !include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
> -!endif
> }
>
> MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
> diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc
> b/OvmfPkg/Microvm/MicrovmX64.dsc
> index d5bdcbb9835c..2d53b5c2950d 100644
> --- a/OvmfPkg/Microvm/MicrovmX64.dsc
> +++ b/OvmfPkg/Microvm/MicrovmX64.dsc
> @@ -705,8 +705,8 @@ [Components]
> <LibraryClasses>
> !if $(SECURE_BOOT_ENABLE) == TRUE
>
> NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.i
> nf
> +!endif
> !include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
> -!endif
> }
>
> MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
> diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
> index 8401d7390005..3f970a79a08a 100644
> --- a/OvmfPkg/OvmfPkgX64.dsc
> +++ b/OvmfPkg/OvmfPkgX64.dsc
> @@ -805,8 +805,8 @@ [Components]
> <LibraryClasses>
> !if $(SECURE_BOOT_ENABLE) == TRUE
>
> NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.i
> nf
> +!endif
> !include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
> -!endif
> }
>
> MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
> --
> 2.39.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [edk2-devel] [PATCH 1/1] OvmfPkg: fix OvmfTpmSecurityStub.dsc.inc include
[not found] ` <1739D137612FA4DE.25137@groups.io>
@ 2023-01-13 14:33 ` Yao, Jiewen
0 siblings, 0 replies; 3+ messages in thread
From: Yao, Jiewen @ 2023-01-13 14:33 UTC (permalink / raw)
To: devel@edk2.groups.io, Yao, Jiewen, Gerd Hoffmann
Cc: Justen, Jordan L, Oliver Steffen, Boeuf, Sebastien,
Pawel Polawski, Ard Biesheuvel
Merged https://github.com/tianocore/edk2/pull/3892
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Yao,
> Jiewen
> Sent: Friday, January 13, 2023 4:33 PM
> To: Gerd Hoffmann <kraxel@redhat.com>; devel@edk2.groups.io
> Cc: Justen, Jordan L <jordan.l.justen@intel.com>; Oliver Steffen
> <osteffen@redhat.com>; Boeuf, Sebastien <sebastien.boeuf@intel.com>;
> Pawel Polawski <ppolawsk@redhat.com>; Ard Biesheuvel
> <ardb+tianocore@kernel.org>
> Subject: Re: [edk2-devel] [PATCH 1/1] OvmfPkg: fix
> OvmfTpmSecurityStub.dsc.inc include
>
> Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>
>
> > -----Original Message-----
> > From: Gerd Hoffmann <kraxel@redhat.com>
> > Sent: Thursday, January 12, 2023 11:41 PM
> > To: devel@edk2.groups.io
> > Cc: Gerd Hoffmann <kraxel@redhat.com>; Justen, Jordan L
> > <jordan.l.justen@intel.com>; Oliver Steffen <osteffen@redhat.com>; Boeuf,
> > Sebastien <sebastien.boeuf@intel.com>; Pawel Polawski
> > <ppolawsk@redhat.com>; Ard Biesheuvel <ardb+tianocore@kernel.org>;
> > Yao, Jiewen <jiewen.yao@intel.com>
> > Subject: [PATCH 1/1] OvmfPkg: fix OvmfTpmSecurityStub.dsc.inc include
> >
> > TPM support is independent from secure boot support. Move the TPM
> > include snipped out of the secure boot !if block.
> >
> > Fixes: b47575801e19 ("OvmfPkg: move tcg configuration to dsc and fdf
> > include files")
> > Bugzilla: https://bugzilla.tianocore.org//show_bug.cgi?id=4290
> > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> > ---
> > OvmfPkg/CloudHv/CloudHvX64.dsc | 2 +-
> > OvmfPkg/Microvm/MicrovmX64.dsc | 2 +-
> > OvmfPkg/OvmfPkgX64.dsc | 2 +-
> > 3 files changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc
> > b/OvmfPkg/CloudHv/CloudHvX64.dsc
> > index 03b7a5cc6b64..7326417eab62 100644
> > --- a/OvmfPkg/CloudHv/CloudHvX64.dsc
> > +++ b/OvmfPkg/CloudHv/CloudHvX64.dsc
> > @@ -716,8 +716,8 @@ [Components]
> > <LibraryClasses>
> > !if $(SECURE_BOOT_ENABLE) == TRUE
> >
> >
> NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.i
> > nf
> > +!endif
> > !include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
> > -!endif
> > }
> >
> > MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
> > diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc
> > b/OvmfPkg/Microvm/MicrovmX64.dsc
> > index d5bdcbb9835c..2d53b5c2950d 100644
> > --- a/OvmfPkg/Microvm/MicrovmX64.dsc
> > +++ b/OvmfPkg/Microvm/MicrovmX64.dsc
> > @@ -705,8 +705,8 @@ [Components]
> > <LibraryClasses>
> > !if $(SECURE_BOOT_ENABLE) == TRUE
> >
> >
> NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.i
> > nf
> > +!endif
> > !include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
> > -!endif
> > }
> >
> > MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
> > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
> > index 8401d7390005..3f970a79a08a 100644
> > --- a/OvmfPkg/OvmfPkgX64.dsc
> > +++ b/OvmfPkg/OvmfPkgX64.dsc
> > @@ -805,8 +805,8 @@ [Components]
> > <LibraryClasses>
> > !if $(SECURE_BOOT_ENABLE) == TRUE
> >
> >
> NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.i
> > nf
> > +!endif
> > !include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
> > -!endif
> > }
> >
> > MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
> > --
> > 2.39.0
>
>
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-01-13 14:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-12 15:41 [PATCH 1/1] OvmfPkg: fix OvmfTpmSecurityStub.dsc.inc include Gerd Hoffmann
2023-01-13 8:32 ` Yao, Jiewen
[not found] ` <1739D137612FA4DE.25137@groups.io>
2023-01-13 14:33 ` [edk2-devel] " Yao, Jiewen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox