From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=66.187.233.73; helo=mx1.redhat.com; envelope-from=lersek@redhat.com; receiver=edk2-devel@lists.01.org Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 106D02256863F for ; Thu, 8 Mar 2018 08:29:09 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3F91F4023113; Thu, 8 Mar 2018 16:35:25 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-50.rdu2.redhat.com [10.10.120.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id DC2DC202322A; Thu, 8 Mar 2018 16:35:19 +0000 (UTC) To: marcandre.lureau@redhat.com, edk2-devel@lists.01.org Cc: qemu-devel@nongnu.org, javierm@redhat.com, pjones@redhat.com, jiewen.yao@intel.com References: <20180307155746.18526-1-marcandre.lureau@redhat.com> <20180307155746.18526-5-marcandre.lureau@redhat.com> From: Laszlo Ersek Message-ID: <6bae8e57-2ba5-d870-9220-38c30c350978@redhat.com> Date: Thu, 8 Mar 2018 17:35:18 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <20180307155746.18526-5-marcandre.lureau@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Thu, 08 Mar 2018 16:35:25 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Thu, 08 Mar 2018 16:35:25 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'lersek@redhat.com' RCPT:'' Subject: Re: [PATCH v2 4/8] ovmf: simplify SecurityStubDxe.inf inclusion X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Mar 2018 16:29:10 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit On 03/07/18 16:57, marcandre.lureau@redhat.com wrote: > From: Marc-André Lureau > > SecurityStubDxe.inf should be included unconditionally. > > Cc: Laszlo Ersek > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Marc-André Lureau > --- > OvmfPkg/OvmfPkgIa32.dsc | 6 ++---- > OvmfPkg/OvmfPkgIa32X64.dsc | 6 ++---- > OvmfPkg/OvmfPkgX64.dsc | 6 ++---- > 3 files changed, 6 insertions(+), 12 deletions(-) > > diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc > index fbe0f790e431..5bd3f4f977df 100644 > --- a/OvmfPkg/OvmfPkgIa32.dsc > +++ b/OvmfPkg/OvmfPkgIa32.dsc > @@ -611,14 +611,12 @@ [Components] > > MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf > > -!if $(SECURE_BOOT_ENABLE) == TRUE > MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf { > > +!if $(SECURE_BOOT_ENABLE) == TRUE > NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf > - } > -!else > - MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf > !endif > + } > > MdeModulePkg/Universal/EbcDxe/EbcDxe.inf > PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf > diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc > index fb10e0b0f2e4..7dded86c4940 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.dsc > +++ b/OvmfPkg/OvmfPkgIa32X64.dsc > @@ -620,14 +620,12 @@ [Components.X64] > > MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf > > -!if $(SECURE_BOOT_ENABLE) == TRUE > MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf { > > +!if $(SECURE_BOOT_ENABLE) == TRUE > NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf > - } > -!else > - MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf > !endif > + } > > MdeModulePkg/Universal/EbcDxe/EbcDxe.inf > PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc > index a31551f5ae24..a8e89276c0b2 100644 > --- a/OvmfPkg/OvmfPkgX64.dsc > +++ b/OvmfPkg/OvmfPkgX64.dsc > @@ -618,14 +618,12 @@ [Components] > > MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf > > -!if $(SECURE_BOOT_ENABLE) == TRUE > MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf { > > +!if $(SECURE_BOOT_ENABLE) == TRUE > NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf > - } > -!else > - MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf > !endif > + } > > MdeModulePkg/Universal/EbcDxe/EbcDxe.inf > PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf > Please change the subject as follows: OvmfPkg: simplify SecurityStubDxe.inf inclusion With that update: Reviewed-by: Laszlo Ersek Thanks Laszlo