From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 1D329941937 for ; Thu, 14 Mar 2024 14:45:50 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=jSxr6WETUIdrMYFCzTmAliaJY5ZFa1lotqvtcxxOTMY=; c=relaxed/simple; d=groups.io; h=From:To:Cc:References:In-Reply-To:Subject:Date:Message-ID:MIME-Version:Thread-Index:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Resent-Date:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Type:Content-Transfer-Encoding:Content-Language; s=20240206; t=1710427549; v=1; b=4/9ra2wABnPp3C+vgr8SMliiD1Wmf3H08wihHfuLt8q+yA/xTyuOsdEvkgIhDlegcjvgFgnM dMqfcFiZQKmN5b/UKYFogXZac6M4wPxvSawwBklfHfaKqusUBcBN1IsGEqzwoCy7iCiJGLbg7rI dlm/rpPGvz0ZDdKrDV/WgRYrzyVC3CttrJr1CzrR4BktO3N+GPmEomHvTYBsBCa/keTQMUBo0Ze pvzht8zEs2GgO4tEIlJkiceoXQokDeNKxCRkqTa+IX54pLxk6aYFLJAPdPc10cAATeynW2Imajh VcFY3bKDlmWUw17tLpiq31rNVo9j+IXkdiEfJ8ItekuCA== X-Received: by 127.0.0.2 with SMTP id iN1VYY7687511xBE2AbzBqlh; Thu, 14 Mar 2024 07:45:49 -0700 X-Received: from cxsh.intel-email.com (cxsh.intel-email.com [121.46.250.151]) by mx.groups.io with SMTP id smtpd.web11.14330.1710427548007204083 for ; Thu, 14 Mar 2024 07:45:49 -0700 X-Received: from cxsh.intel-email.com (localhost [127.0.0.1]) by cxsh.intel-email.com (Postfix) with ESMTP id A0480DDA78E for ; Thu, 14 Mar 2024 22:45:44 +0800 (CST) X-Received: from localhost (localhost [127.0.0.1]) by cxsh.intel-email.com (Postfix) with ESMTP id 9AC39DDA784 for ; Thu, 14 Mar 2024 22:45:44 +0800 (CST) X-Received: from mail.byosoft.com.cn (mail.byosoft.com.cn [58.240.74.242]) by cxsh.intel-email.com (Postfix) with SMTP id A39C1DDA785 for ; Thu, 14 Mar 2024 22:45:41 +0800 (CST) X-Received: from DESKTOPS6D0PVI ([114.93.194.54]) (envelope-sender ) by 192.168.6.13 with ESMTP(SSL) for ; Thu, 14 Mar 2024 22:45:33 +0800 X-WM-Sender: gaoliming@byosoft.com.cn X-Originating-IP: 114.93.194.54 X-WM-AuthFlag: YES X-WM-AuthUser: gaoliming@byosoft.com.cn From: "gaoliming via groups.io" To: , Cc: "'Rebecca Cran'" , "'Bob Feng'" , "'Yuwei Chen'" References: <20240313151507.1287-1-joey.vagedes@gmail.com> In-Reply-To: <20240313151507.1287-1-joey.vagedes@gmail.com> Subject: =?UTF-8?B?5Zue5aSNOiBbZWRrMi1kZXZlbF0gW1BBVENIIHYxIDEvMV0gQmFzZVRvb2xzOiBJbmZCdWlsZERhdGE6IEZpeCBQcml2YXRlIHZhbHVlIHJldHJpZXZhbA==?= Date: Thu, 14 Mar 2024 22:45:36 +0800 Message-ID: <034601da761e$46ad7440$d4085cc0$@byosoft.com.cn> MIME-Version: 1.0 Thread-Index: AQHCMNNlf8VWUzROgznhmSF5464QRrFn2tWg Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Resent-Date: Thu, 14 Mar 2024 07:45:49 -0700 Reply-To: devel@edk2.groups.io,gaoliming@byosoft.com.cn List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: pwHvFObNVQyNMHcoDPJXpl4Gx7686176AA= Content-Type: text/plain; charset="gb2312" Content-Transfer-Encoding: quoted-printable Content-Language: zh-cn X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b="4/9ra2wA"; dmarc=pass (policy=none) header.from=groups.io; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io This change is good to me. Reviewed-by: Liming Gao > -----=D3=CA=BC=FE=D4=AD=BC=FE----- > =B7=A2=BC=FE=C8=CB: devel@edk2.groups.io =B4=FA=B1= =ED Joey Vagedes > via groups.io > =B7=A2=CB=CD=CA=B1=BC=E4: 2024=C4=EA3=D4=C213=C8=D5 23:15 > =CA=D5=BC=FE=C8=CB: devel@edk2.groups.io > =B3=AD=CB=CD: Rebecca Cran ; Liming Gao > ; Bob Feng ; Yuwei Chen > > =D6=F7=CC=E2: [edk2-devel] [PATCH v1 1/1] BaseTools: InfBuildData: Fix Pr= ivate value > retrieval >=20 > Update retrieval of private guids, protocols, or ppis from a package's > declaration file to use the original path of the module's INF file > rather than the current path. When building the same module multiple > times in the same INF (by override the define's FILE_GUID), a temporary > instance of the module is generated outside the package, causing the > retrieval of private values to fail as the check to access private > values is done by verifying the module to build, is inside the package. >=20 > Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4730 >=20 > Signed-off-by: Joey Vagedes >=20 > Cc: Rebecca Cran > Cc: Liming Gao > Cc: Bob Feng > Cc: Yuwei Chen > --- > BaseTools/Source/Python/Workspace/InfBuildData.py | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) >=20 > diff --git a/BaseTools/Source/Python/Workspace/InfBuildData.py > b/BaseTools/Source/Python/Workspace/InfBuildData.py > index e4ff1c668666..6339e494ca87 100644 > --- a/BaseTools/Source/Python/Workspace/InfBuildData.py > +++ b/BaseTools/Source/Python/Workspace/InfBuildData.py > @@ -592,7 +592,7 @@ class InfBuildData(ModuleBuildClassObject): > RecordList =3D self._RawData[MODEL_EFI_PROTOCOL, self._Arch, > self._Platform] >=20 > for Record in RecordList: >=20 > CName =3D Record[0] >=20 > - Value =3D _ProtocolValue(CName, self.Packages, > self.MetaFile.Path) >=20 > + Value =3D _ProtocolValue(CName, self.Packages, > self.MetaFile.OriginalPath.Path) >=20 > if Value is None: >=20 > PackageList =3D "\n\t".join(str(P) for P in self.Package= s) >=20 > EdkLogger.error('build', RESOURCE_NOT_AVAILABLE, >=20 > @@ -616,7 +616,7 @@ class InfBuildData(ModuleBuildClassObject): > RecordList =3D self._RawData[MODEL_EFI_PPI, self._Arch, > self._Platform] >=20 > for Record in RecordList: >=20 > CName =3D Record[0] >=20 > - Value =3D _PpiValue(CName, self.Packages, self.MetaFile.Path= ) >=20 > + Value =3D _PpiValue(CName, self.Packages, > self.MetaFile.OriginalPath.Path) >=20 > if Value is None: >=20 > PackageList =3D "\n\t".join(str(P) for P in self.Package= s) >=20 > EdkLogger.error('build', RESOURCE_NOT_AVAILABLE, >=20 > @@ -640,7 +640,7 @@ class InfBuildData(ModuleBuildClassObject): > RecordList =3D self._RawData[MODEL_EFI_GUID, self._Arch, > self._Platform] >=20 > for Record in RecordList: >=20 > CName =3D Record[0] >=20 > - Value =3D GuidValue(CName, self.Packages, self.MetaFile.Path= ) >=20 > + Value =3D GuidValue(CName, self.Packages, > self.MetaFile.OriginalPath.Path) >=20 > if Value is None: >=20 > PackageList =3D "\n\t".join(str(P) for P in self.Package= s) >=20 > EdkLogger.error('build', RESOURCE_NOT_AVAILABLE, >=20 > @@ -655,7 +655,7 @@ class InfBuildData(ModuleBuildClassObject): > for TokenSpaceGuid, _, _, _, _, _, LineNo in RecordList: >=20 > # get the guid value >=20 > if TokenSpaceGuid not in RetVal: >=20 > - Value =3D GuidValue(TokenSpaceGuid, self.Packages, > self.MetaFile.Path) >=20 > + Value =3D GuidValue(TokenSpaceGuid, self.Packages, > self.MetaFile.OriginalPath.Path) >=20 > if Value is None: >=20 > PackageList =3D "\n\t".join(str(P) for P in > self.Packages) >=20 > EdkLogger.error('build', > RESOURCE_NOT_AVAILABLE, >=20 > @@ -818,11 +818,11 @@ class InfBuildData(ModuleBuildClassObject): > Value =3D Token >=20 > else: >=20 > # get the GUID value now >=20 > - Value =3D _ProtocolValue(Token, self.Packages, > self.MetaFile.Path) >=20 > + Value =3D _ProtocolValue(Token, self.Packages, > self.MetaFile.OriginalPath.Path) >=20 > if Value is None: >=20 > - Value =3D _PpiValue(Token, self.Packages, > self.MetaFile.Path) >=20 > + Value =3D _PpiValue(Token, self.Packages, > self.MetaFile.OriginalPath.Path) >=20 > if Value is None: >=20 > - Value =3D GuidValue(Token, > self.Packages, self.MetaFile.Path) >=20 > + Value =3D GuidValue(Token, > self.Packages, self.MetaFile.OriginalPath.Path) >=20 >=20 >=20 > if Value is None: >=20 > PackageList =3D "\n\t".join(str(P) for P in > self.Packages) >=20 > -- > 2.40.1.vfs.0.0 >=20 >=20 >=20 > -=3D-=3D-=3D-=3D-=3D-=3D > Groups.io Links: You receive all messages sent to this group. > View/Reply Online (#116716): > https://edk2.groups.io/g/devel/message/116716 > Mute This Topic: https://groups.io/mt/104907485/4905953 > Group Owner: devel+owner@edk2.groups.io > Unsubscribe: https://edk2.groups.io/g/devel/unsub > [gaoliming@byosoft.com.cn] > -=3D-=3D-=3D-=3D-=3D-=3D >=20 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#116757): https://edk2.groups.io/g/devel/message/116757 Mute This Topic: https://groups.io/mt/104927681/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-