From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: liming.gao@intel.com) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by groups.io with SMTP; Thu, 09 May 2019 07:06:48 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 May 2019 07:06:47 -0700 X-ExtLoop1: 1 Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by orsmga004.jf.intel.com with ESMTP; 09 May 2019 07:06:47 -0700 Received: from fmsmsx111.amr.corp.intel.com (10.18.116.5) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.408.0; Thu, 9 May 2019 07:06:47 -0700 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by fmsmsx111.amr.corp.intel.com (10.18.116.5) with Microsoft SMTP Server (TLS) id 14.3.408.0; Thu, 9 May 2019 07:06:47 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.33]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.18]) with mapi id 14.03.0415.000; Thu, 9 May 2019 22:06:45 +0800 From: "Liming Gao" To: "Fan, ZhijuX" , "devel@edk2.groups.io" CC: "Feng, Bob C" Subject: Re: [PATCH V2] BaseTools:Enables FFS to support the GUID value format Thread-Topic: [PATCH V2] BaseTools:Enables FFS to support the GUID value format Thread-Index: AdUGXoT6ImiCqLHTQZqGTijNml+mYQAEeWzA Date: Thu, 9 May 2019 14:06:44 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E445E50@SHSMSX104.ccr.corp.intel.com> References: In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZDdiZGNhOTUtYzUxNy00ZWM3LTk0NzAtMTcxNDE1YjA1ODYwIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiTm9yUGt3SHJcL2t5QjRcLzdpaWJsTFdLMEdyMlBZUXJoQkZHVksrdTJKc2RBWWp4TVwvd2hNS2xGbTZIcVBZUTFCWCJ9 dlp-product: dlpe-windows dlp-version: 11.0.600.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: liming.gao@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao > -----Original Message----- > From: Fan, ZhijuX > Sent: Thursday, May 9, 2019 7:59 PM > To: devel@edk2.groups.io > Cc: Gao, Liming ; Feng, Bob C > Subject: [PATCH V2] BaseTools:Enables FFS to support the GUID value forma= t >=20 > BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=3D1768 >=20 > Per FDF spec, FFS Rule can specify the hard code FILE Guid value. > But,BaseTools reports the build failure.It should be fixed. >=20 > This patch is going to fix that issue. >=20 > Cc: Bob Feng > Cc: Liming Gao > Signed-off-by: Zhiju.Fan > --- > BaseTools/Source/Python/GenFds/FdfParser.py | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) >=20 > diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Sour= ce/Python/GenFds/FdfParser.py > index 54f61ae05e..ea1c3eeb30 100644 > --- a/BaseTools/Source/Python/GenFds/FdfParser.py > +++ b/BaseTools/Source/Python/GenFds/FdfParser.py > @@ -3605,7 +3605,12 @@ class FdfParser: >=20 > if not self._IsKeyword("$(NAMED_GUID)"): > if not self._GetNextWord(): > - raise Warning.Expected("$(NAMED_GUID)", self.FileName, s= elf.CurrentLineNumber) > + NamedGuid =3D self._CurrentLine()[self.CurrentOffsetWith= inLine:].split()[0].strip() > + if GlobalData.gGuidPatternEnd.match(NamedGuid): > + self.CurrentOffsetWithinLine +=3D len(NamedGuid) > + self._Token =3D NamedGuid > + else: > + raise Warning.Expected("$(NAMED_GUID)", self.FileNam= e, self.CurrentLineNumber) > if self._Token =3D=3D 'PCD': > if not self._IsToken("("): > raise Warning.Expected("'('", self.FileName, self.Cu= rrentLineNumber) > -- > 2.14.1.windows.1