From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=UcwSECNF; spf=pass (domain: linaro.org, ip: 209.85.128.66, mailfrom: leif.lindholm@linaro.org) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by groups.io with SMTP; Tue, 27 Aug 2019 08:50:37 -0700 Received: by mail-wm1-f66.google.com with SMTP id 10so3634036wmp.3 for ; Tue, 27 Aug 2019 08:50:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=iiUGhEMQH7/YWJs2VlhyqRI42x1drhPWSwT402yr7HQ=; b=UcwSECNF9fyu38MN8+dzycKTVz3/fgi/Nc3bH8DNJ44SyLgIDniRH65eln+vePfHk0 MFoTza6ZypNvtnIRNeTx6+nH2K2ebbtct+Le73BO7jaDnP1ypLJdtcQbVu4Xv897qnNp nI8RznAYYBTUb/iwvXMzEPdk2tiiEYpVBbR5mU+pAGWiuO4HumHnEVWPUXrM7OfO0+Si tCpKXXsCIb59o3LRLkjkLISbVKDlsutE6fEvSeQVvC4Sc+zGdo3AXrvyWHmzPDS7tDc0 zg97/967o9WS0COYJqV3pK7Nx7OqCmcR+UoK7hHNFnjFi7zQeY7qJObJSRlks8JfW2oR 87mQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=iiUGhEMQH7/YWJs2VlhyqRI42x1drhPWSwT402yr7HQ=; b=gRzn4E8ocTPmE52mnNh4ovZINVRyyywH0cMITcOapUN6Pt85XwGhR01YSkPK3fhZQf Vm1VTvsFQlGqtAJkRkow69VUhBpy6BLE4NbnyjZRczACWJLc6hepITIiijeFeVq6Op9J +AafaK/gjsDwMNY6/QE7mfGbEiibp4CU7Ym5s5nCgKLp0l00kgoZzW+aCZopTM/aIhGl 7JIcnLE31aOvBTo74b1iwLMf/ELhU9VTVyHMq4i+uMf/xqMSlp2OpbXAx01YnKFkwQk+ 1ihR8SUnaBh/GBwT2tr8GgWiyOZejl2Dstlx/0i/T9IdUbvCFxTVlHNEOPLByWe5r8mz 2NsQ== X-Gm-Message-State: APjAAAU/N68CgDvju6bsBrm4M630ArZT4wwAkzW5jakUq5yPJQUe0QG2 w8+RSmQrSFfFlxGrbCi+MQH/qp1BBCY= X-Google-Smtp-Source: APXvYqxBZJokK4k4bSD0WC10cN7OKN7H6Um9r7nTIt4ghOGmxG/ZOuNDNhZUxK4017GQbvv7VdQebA== X-Received: by 2002:a1c:238e:: with SMTP id j136mr28857535wmj.144.1566921035254; Tue, 27 Aug 2019 08:50:35 -0700 (PDT) Return-Path: Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id r1sm1455064wro.13.2019.08.27.08.50.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Aug 2019 08:50:34 -0700 (PDT) Date: Tue, 27 Aug 2019 16:50:33 +0100 From: "Leif Lindholm" To: devel@edk2.groups.io Cc: Andrew Fish , Laszlo Ersek , Michael D Kinney , Baptiste Gerondeau , Jian J Wang , Hao A Wu Subject: edk2-stable201908 Re: [edk2-devel] [PATCH 1/1] MdeModulePkg: fix !x86 builds (more) Message-ID: <20190827155033.GZ29255@bivouac.eciton.net> References: <15BEC8314D338399.15695@groups.io> MIME-Version: 1.0 In-Reply-To: <15BEC8314D338399.15695@groups.io> User-Agent: Mutt/1.10.1 (2018-07-13) Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Apologies, forgot to tag the subject for stable release (although I did remember to cc the stewards). We don't appear to have a fix version for edk2-stable201908 in bugzilla, though. On Tue, Aug 27, 2019 at 01:43:28PM +0100, Leif Lindholm via Groups.Io wrote: > Commit 4a1f6b85c184 > ("MdeModulePkg: add LockBoxNullLib for !IA32/X64 in .dsc") > added an ARM/AARCH64 resolution for LockBoxLib. However, this failed > to address the overrides provided for PEIM, DXE_DRIVER, > DXE_RUNTIME_DRIVER, DXE_SMM_DRIVER and UEFI_DRIVER, so any modules > of those classes still failed to build. > > Break these out properly into their own LibraryClasses sections. > > Resolves BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2134 > > Signed-off-by: Leif Lindholm > Reported-by: Baptiste Gerondeau > Cc: Jian J Wang > Cc: Hao A Wu > --- > > I don't understand how the above would appear to work back when I > submitted the previous patch but not work now, but I haven't dug > into it deeper. Including the x86-specific LockBoxLib in the > .common section is however clearly not correct. > > I think a fix for this issue needs to go into 2019.08, but if > someone has a prettier suggestion, I am not wedded to this one. > > MdeModulePkg/MdeModulePkg.dsc | 16 +++++++++++++--- > 1 file changed, 13 insertions(+), 3 deletions(-) > > diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc > index 4320839abfb5..15ba96cecbed 100644 > --- a/MdeModulePkg/MdeModulePkg.dsc > +++ b/MdeModulePkg/MdeModulePkg.dsc > @@ -109,6 +109,8 @@ [LibraryClasses.common.PEIM] > HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf > MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf > ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf > + > +[LibraryClasses.IA32.PEIM,LibraryClasses.X64.PEIM] > LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf > > [LibraryClasses.common.DXE_CORE] > @@ -118,18 +120,22 @@ [LibraryClasses.common.DXE_CORE] > > [LibraryClasses.common.DXE_DRIVER] > HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf > - LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf > MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf > ExtractGuidedSectionLib|MdePkg/Library/DxeExtractGuidedSectionLib/DxeExtractGuidedSectionLib.inf > CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf > > +[LibraryClasses.IA32.DXE_DRIVER,LibraryClasses.X64.DXE_DRIVER] > + LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf > + > [LibraryClasses.common.DXE_RUNTIME_DRIVER] > HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf > MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf > DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf > - LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf > CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.inf > > +[LibraryClasses.IA32.DXE_RUNTIME_DRIVER,LibraryClasses.X64.DXE_RUNTIME_DRIVER] > + LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf > + > [LibraryClasses.common.SMM_CORE] > HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf > MemoryAllocationLib|MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.inf > @@ -143,13 +149,17 @@ [LibraryClasses.common.DXE_SMM_DRIVER] > MemoryAllocationLib|MdePkg/Library/SmmMemoryAllocationLib/SmmMemoryAllocationLib.inf > MmServicesTableLib|MdePkg/Library/MmServicesTableLib/MmServicesTableLib.inf > SmmServicesTableLib|MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.inf > + SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf > + > +[LibraryClasses.IA32.DXE_SMM_DRIVER,LibraryClasses.X64.DXE_SMM_DRIVER] > LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.inf > - SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf > > [LibraryClasses.common.UEFI_DRIVER] > HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf > MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf > DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf > + > +[LibraryClasses.IA32.UEFI_DRIVER,LibraryClasses.X64.UEFI_DRIVER] > LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf > > [LibraryClasses.common.UEFI_APPLICATION] > -- > 2.20.1 > > > >