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.24, mailfrom: zhijux.fan@intel.com) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by groups.io with SMTP; Thu, 09 May 2019 04:58:37 -0700 X-Amp-Result: UNSCANNABLE X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 May 2019 04:58:36 -0700 X-ExtLoop1: 1 Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by fmsmga001.fm.intel.com with ESMTP; 09 May 2019 04:58:36 -0700 Received: from fmsmsx114.amr.corp.intel.com (10.18.116.8) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.408.0; Thu, 9 May 2019 04:58:35 -0700 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by FMSMSX114.amr.corp.intel.com (10.18.116.8) with Microsoft SMTP Server (TLS) id 14.3.408.0; Thu, 9 May 2019 04:58:35 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.129]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.70]) with mapi id 14.03.0415.000; Thu, 9 May 2019 19:58:33 +0800 From: "Fan, ZhijuX" To: "devel@edk2.groups.io" CC: "Gao, Liming" , "Feng, Bob C" Subject: [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+mYQ== Date: Thu, 9 May 2019 11:58:32 +0000 Message-ID: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: 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: zhijux.fan@intel.com X-Groupsio-MsgNum: 40333 Content-Type: multipart/mixed; boundary="_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF5D950SHSMSX101ccrcor_" Content-Language: en-US --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF5D950SHSMSX101ccrcor_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=3D1768 Per FDF spec, FFS Rule can specify the hard code FILE Guid value. But,BaseTools reports the build failure.It should be fixed. This patch is going to fix that issue. 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(-) diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source= /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, sel= f.CurrentLineNumber) + NamedGuid =3D self._CurrentLine()[self.CurrentOffsetWithin= Line:].split()[0].strip() + if GlobalData.gGuidPatternEnd.match(NamedGuid): + self.CurrentOffsetWithinLine +=3D len(NamedGuid) + self._Token =3D NamedGuid + else: + raise Warning.Expected("$(NAMED_GUID)", self.FileName,= self.CurrentLineNumber) if self._Token =3D=3D 'PCD': if not self._IsToken("("): raise Warning.Expected("'('", self.FileName, self.Curr= entLineNumber) --=20 2.14.1.windows.1 --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF5D950SHSMSX101ccrcor_ Content-Disposition: attachment; filename="winmail.dat" Content-Transfer-Encoding: base64 Content-Type: application/ms-tnef; name="winmail.dat" eJ8+Iv4RAQaQCAAEAAAAAAABAAEAAQeQBgAIAAAA5AQAAAAAAADoAAEJgAEAIQAAADFDN0VCMkQ0 NTk5NzUwNDA4OTkyNDAxQzQwRDFDRjM3AAMHAQ2ABAACAAAAAgACAAEFgAMADgAAAOMHBQAJAAsA OgAgAAQAYQEBIIADAA4AAADjBwUACQALADoAIAAEAGEBAQiABwAYAAAASVBNLk1pY3Jvc29mdCBN YWlsLk5vdGUAMQgBBIABAEIAAABbUEFUQ0ggVjJdIEJhc2VUb29sczpFbmFibGVzIEZGUyB0byBz dXBwb3J0IHRoZSBHVUlEIHZhbHVlIGZvcm1hdAA/FgELgAEAIQAAADFDN0VCMkQ0NTk5NzUwNDA4 OTkyNDAxQzQwRDFDRjM3AAMHAQOQBgA8DgAANAAAAAIBfwABAAAASAAAADxGQUQwRDdFMEFFMEZB NTREOTg3RjZFNzI0MzVDQUZENTBBRjVEOTUwQFNIU01TWDEwMS5jY3IuY29ycC5pbnRlbC5jb20+ AAsAHw4BAAAAAgEJEAEAAABhBAAAXQQAAA4IAABMWkZ1colMcWEACmZiaWQEAABjY8BwZzEyNTIA /gND8HRleHQB9wKkA+MCAARjaArAc2V0MCDvB20CgwBQEU0yCoAGtAKAln0KgAjIOwliMTkOwL8J wxZyCjIWcQKAFWIqCbBzCfAEkGF0BbIOUANgc6JvAYAgRXgRwW4YMF0GUnYEkBe2AhByAMB0fQhQ bhoxECAFwAWgG2RkmiADUiAQIheyXHYIkOR3awuAZDUdUwTwB0ANF3AwCnEX8mJrbWsGcwGQACAg Qk1fQuBFR0lOfQr8AfEL8REfsFo6aAJAcHM6wC8vYnVnegMQC2AkLnQHMG5vBaFlLgEFsGcvc2hv d19BIlEuY2dpPw3QPUAxNzY4XGwLgGULCoElFFAbsUZERiBUc3AFkCwmEEYF8FK+dR5wG9ADkSZi BpB5HMB+aBngEdEcYAWgAQAmEEkgTEUgR3UN0CB2CwdAClAuJQVCdXQs5EJhEgBUbwbwBCAJcP5w CREEICgSIlADEBxhC3B7CkAjUUkFQCPBJxAcYGJxGeBmaXgJgCnmJQVUqmgEACAKsHQRwCAvEdRn bwuAZxzAby2iKAEbGIAvkXMpyCUFQ2M6uR+wb2ImEAnwMBA8BuDSYiRALmYywUALgBAg1mwkQANw PjHJTAdwL/I0R2EwQDwlEDUyLmcnNZAzvxTAaWcYUGQtoRkwZi1ieTJQWi8AkGp1LkYDkTx6OJLO eDNgAHA2fwotOvAlBRMfsCq2L1MIYWNlL0xQeSgQAiAvRwnwRiZkPCA9UGZQEeJyLoJwJ/B8IDcg Kz6jXTsXMS2hJyIZo2QmoDYXL5AAgBuBaQIgcygrPikmoD+QAQAecEECKC3uKSUMDeABICA68CRg BUDcYS87rzy/PchiRB9FLw89uCUFHbEQMCA1NGYoNjFhCmA1I2AuZZBhMWMzCeBiMxIw8R6RNjQ0 OohD/0fvSP8/CoA+oUbfTg9PHwqAQEDpQ5AzNkrwLD6BVAMOkLogU8FjC2AEET2XOjsmdzsmVyYG kCAjECzxM/BmAC5fSXNLZXl3AQWwZCgiJChOQQBNRURfR1VJRHgpIilWJ1qqV7tSIHT7B8AQQFdY 4loXTOBdrRhw+wQAGeBXCsADADYRGXAmcS8cQVkeJqBYI0Y/wU5h+weAYQVDCHAJcAIwNRAYUPxO dQbQBJBCZlBgXa1hsrpkKUM9WBViaVzwW2Iatk8BIBIBV0PQLwBuYtJYOl0uJmAlEHRm0TC9aNF0 BRFc8GOPWwhHCQDaYgdARBiAIsBnKUI9wOsCQASRRR3ALhsREcBZQP9lFloXao9a4mcPaBk+kGWg Xx5wQjBt2G6Pb55fKuBr/wnwZZFlB3MvWuUz8BIAbn//Xe9e/2APYR9iL2M6Wq5068FloCdQQ0Qn Wi9a//9YRHVDWRBZEFofeR96L3sx+CcoJ3w/fU9jHEzRJQXQMi4xNIvALgPwHcA9I+Bzi8AlDBVC jdAAAAAfAEIAAQAAABgAAABGAGEAbgAsACAAWgBoAGkAagB1AFgAAAAfAGUAAQAAACoAAAB6AGgA aQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAAAB8AZAABAAAACgAAAFMATQBU AFAAAAAAAAIBQQABAAAAZAAAAAAAAACBKx+kvqMQGZ1uAN0BD1QCAAAAgEYAYQBuACwAIABaAGgA aQBqAHUAWAAAAFMATQBUAFAAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBv AG0AAAAfAAJdAQAAACoAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0A AAAAAB8A5V8BAAAAMgAAAHMAaQBwADoAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAu AGMAbwBtAAAAAAAfABoMAQAAABgAAABGAGEAbgAsACAAWgBoAGkAagB1AFgAAAAfAB8MAQAAACoA AAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAAAB8AHgwBAAAACgAA AFMATQBUAFAAAAAAAAIBGQwBAAAAZAAAAAAAAACBKx+kvqMQGZ1uAN0BD1QCAAAAgEYAYQBuACwA IABaAGgAaQBqAHUAWAAAAFMATQBUAFAAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBs AC4AYwBvAG0AAAAfAAFdAQAAACoAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4A YwBvAG0AAAAAAB8A+D8BAAAAGAAAAEYAYQBuACwAIABaAGgAaQBqAHUAWAAAAB8AI0ABAAAAKgAA AHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4AdABlAGwALgBjAG8AbQAAAAAAHwAiQAEAAAAKAAAA UwBNAFQAUAAAAAAAAgH5PwEAAABkAAAAAAAAAIErH6S+oxAZnW4A3QEPVAIAAACARgBhAG4ALAAg AFoAaABpAGoAdQBYAAAAUwBNAFQAUAAAAHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4AdABlAGwA LgBjAG8AbQAAAB8ACV0BAAAAKgAAAHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4AdABlAGwALgBj AG8AbQAAAAAACwBAOgEAAAAfABoAAQAAABIAAABJAFAATQAuAE4AbwB0AGUAAAAAAAMA8T8JBAAA CwBAOgEAAAADAP0/5AQAAAIBCzABAAAAEAAAABx+stRZl1BAiZJAHEDRzzcDABcAAQAAAEAAOQAA ZN+FXgbVAUAACDBomneGXgbVAR8AAICGAwIAAAAAAMAAAAAAAABGAQAAAB4AAABhAGMAYwBlAHAA dABsAGEAbgBnAHUAYQBnAGUAAAAAAAEAAAAMAAAAZQBuAC0AVQBTAAAAHwA3AAEAAACEAAAAWwBQ AEEAVABDAEgAIABWADIAXQAgAEIAYQBzAGUAVABvAG8AbABzADoARQBuAGEAYgBsAGUAcwAgAEYA RgBTACAAdABvACAAcwB1AHAAcABvAHIAdAAgAHQAaABlACAARwBVAEkARAAgAHYAYQBsAHUAZQAg AGYAbwByAG0AYQB0AAAAHwA9AAEAAAACAAAAAAAAAAMANgAAAAAAAgFxAAEAAAAWAAAAAdUGXoT6 ImiCqLHTQZqGTijNml+mYQAAHwBwAAEAAACEAAAAWwBQAEEAVABDAEgAIABWADIAXQAgAEIAYQBz AGUAVABvAG8AbABzADoARQBuAGEAYgBsAGUAcwAgAEYARgBTACAAdABvACAAcwB1AHAAcABvAHIA dAAgAHQAaABlACAARwBVAEkARAAgAHYAYQBsAHUAZQAgAGYAbwByAG0AYQB0AAAAHwA1EAEAAACQ AAAAPABGAEEARAAwAEQANwBFADAAQQBFADAARgBBADUANABEADkAOAA3AEYANgBFADcAMgA0ADMA NQBDAEEARgBEADUAMABBAEYANQBEADkANQAwAEAAUwBIAFMATQBTAFgAMQAwADEALgBjAGMAcgAu AGMAbwByAHAALgBpAG4AdABlAGwALgBjAG8AbQA+AAAAAwDeP59OAABAAAcwBjl1hl4G1QECAQsA AQAAABAAAAAcfrLUWZdQQImSQBxA0c83AwAmAAAAAAACAUcAAQAAADIAAABjPVVTO2E9TUNJO3A9 SW50ZWw7bD1TSFNNU1gxMDEtMTkwNTA5MTE1ODMyWi05MzQxAAAAAgEQMAEAAABGAAAAAAAAACZ3 vTk77DhJpKYVPcule0IHAPrQ1+CuD6VNmH9uckNcr9UAAABEEV4AAKaTaDaIdmxLp0rT60eaTGQA AAlUj3EAAAAAHwD6PwEAAAAYAAAARgBhAG4ALAAgAFoAaABpAGoAdQBYAAAAAwAJWQEAAABAAACA CCAGAAAAAADAAAAAAAAARgAAAAC/hQAAoBIKhV4G1QELAACACCAGAAAAAADAAAAAAAAARgAAAACC hQAAAAAAAAMAAIAIIAYAAAAAAMAAAAAAAABGAAAAAOuFAAAJBAAAHwAAgIYDAgAAAAAAwAAAAAAA AEYBAAAAGAAAAGQAbABwAC0AcAByAG8AZAB1AGMAdAAAAAEAAAAaAAAAZABsAHAAZQAtAHcAaQBu AGQAbwB3AHMAAAAAAB8AAICGAwIAAAAAAMAAAAAAAABGAQAAABgAAABkAGwAcAAtAHYAZQByAHMA aQBvAG4AAAABAAAAFgAAADEAMQAuADAALgA2ADAAMAAuADcAAAAAAB8AAICGAwIAAAAAAMAAAAAA AABGAQAAABoAAABkAGwAcAAtAHIAZQBhAGMAdABpAG8AbgAAAAAAAQAAABQAAABuAG8ALQBhAGMA dABpAG8AbgAAAAMADTT9PwAAHwAAgIYDAgAAAAAAwAAAAAAAAEYBAAAAIAAAAHgALQBtAHMALQBo AGEAcwAtAGEAdAB0AGEAYwBoAAAAAQAAAAIAAAAAAAAAHwAAgIYDAgAAAAAAwAAAAAAAAEYBAAAA IgAAAHgALQBvAHIAaQBnAGkAbgBhAHQAaQBuAGcALQBpAHAAAAAAAAEAAAAgAAAAWwAxADAALgAy ADMAOQAuADEAMgA3AC4ANAAwAF0AAAB48w== --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF5D950SHSMSX101ccrcor_--