From nobody Thu May 2 22:56:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+40312+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40312+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1557394447; cv=none; d=zoho.com; s=zohoarc; b=MJBLoJfpn17XlFnwPigVZwhG50zsvQEIkql6gs3M7XwjttyGO3l2KnVY8K1QL7I6gcC+Za3Yhbkjnr4HcNkxQZ/UP15jftLYjSP3aD/aebVla3Ep2RdxLTTS5kQMLnK4cAlUk7RtvRLj3FeqzAik8FWSTw2WQGfMtX2JygI2H0U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557394447; h=Content-Type:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To:ARC-Authentication-Results; bh=6TH9gc6N2li0cgbXx1ory9gxvlPD0E79a3C5pca/OIY=; b=K5xtBeDBzcNHlzORJcr69ngSmBRH+THrVcL04aBsoApauPuF/wtufA3X+KAfxIW/p+Da5uwgOZN2jIcciOD5mUBet1MBEDfpeNXaOkRYgfKt9C48RinVhQ24KgFiiIVPI3CdH4kP1kR71sGkkj+PR65I8Jja1r5Z7MlJaqReTgA= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40312+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1557394447566242.52281518238067; Thu, 9 May 2019 02:34:07 -0700 (PDT) Return-Path: X-Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by groups.io with SMTP; Thu, 09 May 2019 02:34:06 -0700 X-Amp-Result: UNSCANNABLE X-Amp-File-Uploaded: False X-Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 May 2019 02:34:04 -0700 X-ExtLoop1: 1 X-Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by orsmga007.jf.intel.com with ESMTP; 09 May 2019 02:34:05 -0700 X-Received: from fmsmsx101.amr.corp.intel.com (10.18.124.199) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.408.0; Thu, 9 May 2019 02:34:04 -0700 X-Received: from shsmsx108.ccr.corp.intel.com (10.239.4.97) by fmsmsx101.amr.corp.intel.com (10.18.124.199) with Microsoft SMTP Server (TLS) id 14.3.408.0; Thu, 9 May 2019 02:34:04 -0700 X-Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.129]) by SHSMSX108.ccr.corp.intel.com ([169.254.8.126]) with mapi id 14.03.0415.000; Thu, 9 May 2019 17:34:02 +0800 From: "Fan, ZhijuX" To: "devel@edk2.groups.io" CC: "Gao, Liming" , "Feng, Bob C" Subject: [edk2-devel] [PATCH] BaseTools:Enables FFS to support the GUID value format Thread-Topic: [PATCH] BaseTools:Enables FFS to support the GUID value format Thread-Index: AdUGSlUrWzv3M5brRuiMkddBiJrFjQ== Date: Thu, 9 May 2019 09:34:02 +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 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,zhijux.fan@intel.com Content-Type: multipart/mixed; boundary="_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF5D8A2SHSMSX101ccrcor_" Content-Language: en-US DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1557394446; bh=9VLY6sgb0GER1gm4zGogJPjEbfozfQVsEb70SsnmORw=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=f6Z+Z7rqUtQuIVJV6HuPO877YpkSvuM04M4AUaYmTa4ihLNV9s+SxqE7bBOGHeYbAhi SUz3NFW8iGQ4wlMuCHTo+oWABdMUuBXj9XcWVX6S15umFqvspDKA+nqN+InCoYMufYkR6 JcF0191+Xg/y+vbgPD/hbdAbI1tQgs0K30w= X-Zoho-Virus-Status: 1 X-ZohoMail-DKIM: pass (identity @groups.io) --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF5D8A2SHSMSX101ccrcor_ Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source= /Python/GenFds/FdfParser.py index 54f61ae05e..aab64d6833 100644 --- a/BaseTools/Source/Python/GenFds/FdfParser.py +++ b/BaseTools/Source/Python/GenFds/FdfParser.py @@ -990,7 +990,7 @@ class FdfParser: =20 TempChar =3D self._CurrentChar() StartPos =3D self.CurrentOffsetWithinLine - if (TempChar >=3D 'a' and TempChar <=3D 'z') or (TempChar >=3D 'A'= and TempChar <=3D 'Z') or TempChar =3D=3D '_': + if (TempChar >=3D 'a' and TempChar <=3D 'z') or (TempChar >=3D 'A'= and TempChar <=3D 'Z') or (TempChar >=3D '0' and TempChar <=3D '9') or Tem= pChar =3D=3D '_': self._GetOneChar() while not self._EndOfLine(): TempChar =3D self._CurrentChar() @@ -1002,6 +1002,8 @@ class FdfParser: break =20 self._Token =3D self._CurrentLine()[StartPos: self.CurrentOffs= etWithinLine] + if (TempChar >=3D '0' and TempChar <=3D '9') and not GlobalDat= a.gGuidPattern.search(self._Token): + return False return True =20 return False --=20 2.14.1.windows.1 -=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 (#40312): https://edk2.groups.io/g/devel/message/40312 Mute This Topic: https://groups.io/mt/31553425/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF5D8A2SHSMSX101ccrcor_ Content-Disposition: attachment; filename="winmail.dat" Content-Transfer-Encoding: base64 Content-Type: application/ms-tnef; name="winmail.dat" eJ8+IoBfAQaQCAAEAAAAAAABAAEAAQeQBgAIAAAA5AQAAAAAAADoAAEJgAEAIQAAAEZGRDkzQjU3 RjNGODg4NDg5NURGOTk3NzkyNEJFRUIzAHUHAQ2ABAACAAAAAgACAAEFgAMADgAAAOMHBQAJAAkA IgACAAQAKQEBIIADAA4AAADjBwUACQAJACIAAgAEACkBAQiABwAYAAAASVBNLk1pY3Jvc29mdCBN YWlsLk5vdGUAMQgBBIABAD8AAABbUEFUQ0hdIEJhc2VUb29sczpFbmFibGVzIEZGUyB0byBzdXBw b3J0IHRoZSBHVUlEIHZhbHVlIGZvcm1hdACXFQELgAEAIQAAAEZGRDkzQjU3RjNGODg4NDg5NURG OTk3NzkyNEJFRUIzAHUHAQOQBgAQDgAAMwAAAAIBfwABAAAASAAAADxGQUQwRDdFMEFFMEZBNTRE OTg3RjZFNzI0MzVDQUZENTBBRjVEOEEyQFNIU01TWDEwMS5jY3IuY29ycC5pbnRlbC5jb20+AAsA Hw4BAAAAAgEJEAEAAABfBAAAWwQAAFgIAABMWkZ1+tRyV2EACmZiaWQEAABjY8BwZzEyNTIA/gND 8HRleHQB9wKkA+MCAARjaArAc2V0MCDvB20CgwBQEU0yCoAGtAKAln0KgAjIOwliMTkOwL8JwxZy CjIWcQKAFWIqCbBzCfAEkGF0BbIOUANgc6JvAYAgRXgRwW4YMF0GUnYEkBe2AhByAMB0fQhQbhox ECAFwAWgG2RkmiADUiAQIheyXHYIkOR3awuAZDUdUwTwB0ANF3AwCnEX8mJrbWsGcwGQACAgQk1f QuBFR0lOfQr8AfEL8REfsFo6aAJAcHM6wC8vYnVnegMQC2AkLnQHMG5vBaFlLgEFsGcvc2hvd19B IlEuY2dpPw3QPUAxNzY4XGwLgGULCoElFFAbsUZERiBUc3AFkCwmEEYF8FK+dR5wG9ADkSZiBpB5 HMB+aBngEdEcYAWgAQAmEEkgTEUgR3UN0CB2CwdAClAuJQVCdXQs5EJhEgBUbwbwBCAJcP5wCREE ICgSIlADEBxhC3B7CkAjUUkFQCPBJxAcYGJxGeBmaXgJgCnmJQVUqmgEACAKsHQRwCAvEdRnbwuA ZxzAby2iKAEbGIAvkXMpyCUFQ2M6uR+wb2ImEAnwMBA8BuDSYiRALmYywUALgBAg1mwkQANwPjHJ TAdwL/I0R2EwQDwlEDUyLmcnNZAzvxTAaWcYUGQtoRkwZi1ieTJQWi8AkGp1LkYDkTx6OJLOeDNg AHA2fwotOvAlBRMfsCq2L1MIYWNlL0xQeSgQAiAvRwnwRiZkPCA9UGZQEeJyLoJwJ/B8IDQgKz6g XTsXMS2hJyIZo2QmoDMXL5AAgBuBaQIgcygrPikmoD9gAQAecEDSKC3uKSUMDeABICA68CRgBUDc YS87rzy/PchiQ+9E/w89uCUFHbEQMCA1NGYoNjFhCmA1I2AuYdEBoDY0ZCTgM0BgHpH9S0A0OohD z0e/SM8KgD6hT0avTd9O7wqAQEBDYDlwOTAsNz6QU9RTkWN3C2AEET2XOjsmOyZWxlSQZW1wQxHR ID0mUOEz8GYuX0MIcAlwAjCtV5IoQjZWx1MfclAZENtX1lhlTwEgEgFXQ6AvAD5uNRAYUDqGVsYG kCAoxVdXPlfgJ2EnTMAdwIVXSDxegXonKSAFse1d3EFez16QWmAEV1hegfxfJ1XGUDBdP15PX19g b7dmP2KFZSwwaK9l4Dlin/9jqlbHVsJYBFHwW5AYUFjffVbHdy8AJyEjECzxWBNF/x3AW6BcYnAQ bc9W31fvb/ljU5IekTIsNj6Qd0M4L1SfVal533QhYglwYWt3Vd9ubyrgawnwdT5yxFvvWjYyUFrv W/ldY/5kv2rvV2v5hEJx0kcJAGIHQER7GIAiwGcpQj3AAkAEkS73EgAKwBHAKH05cxeCO3Qi/Qlw dAhwA6A44CsQXJaJj/kEoVRyClB7f4nvivdMoaElBTIuMTSQYC4D8HsdwCPgc5BgJQwVQpJwAB8A QgABAAAAGAAAAEYAYQBuACwAIABaAGgAaQBqAHUAWAAAAB8AZQABAAAAKgAAAHoAaABpAGoAdQB4 AC4AZgBhAG4AQABpAG4AdABlAGwALgBjAG8AbQAAAAAAHwBkAAEAAAAKAAAAUwBNAFQAUAAAAAAA AgFBAAEAAABkAAAAAAAAAIErH6S+oxAZnW4A3QEPVAIAAACARgBhAG4ALAAgAFoAaABpAGoAdQBY AAAAUwBNAFQAUAAAAHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4AdABlAGwALgBjAG8AbQAAAB8A Al0BAAAAKgAAAHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4AdABlAGwALgBjAG8AbQAAAAAAHwDl XwEAAAAyAAAAcwBpAHAAOgB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0A AAAAAB8AGgwBAAAAGAAAAEYAYQBuACwAIABaAGgAaQBqAHUAWAAAAB8AHwwBAAAAKgAAAHoAaABp AGoAdQB4AC4AZgBhAG4AQABpAG4AdABlAGwALgBjAG8AbQAAAAAAHwAeDAEAAAAKAAAAUwBNAFQA UAAAAAAAAgEZDAEAAABkAAAAAAAAAIErH6S+oxAZnW4A3QEPVAIAAACARgBhAG4ALAAgAFoAaABp AGoAdQBYAAAAUwBNAFQAUAAAAHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4AdABlAGwALgBjAG8A bQAAAB8AAV0BAAAAKgAAAHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4AdABlAGwALgBjAG8AbQAA AAAAHwD4PwEAAAAYAAAARgBhAG4ALAAgAFoAaABpAGoAdQBYAAAAHwAjQAEAAAAqAAAAegBoAGkA agB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAAAAfACJAAQAAAAoAAABTAE0AVABQ AAAAAAACAfk/AQAAAGQAAAAAAAAAgSsfpL6jEBmdbgDdAQ9UAgAAAIBGAGEAbgAsACAAWgBoAGkA agB1AFgAAABTAE0AVABQAAAAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBt AAAAHwAJXQEAAAAqAAAAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAA AAALAEA6AQAAAB8AGgABAAAAEgAAAEkAUABNAC4ATgBvAHQAZQAAAAAAAwDxPwkEAAALAEA6AQAA AAMA/T/kBAAAAgELMAEAAAAQAAAA/9k7V/P4iEiV35l3kkvuswMAFwABAAAAQAA5AABhJlZKBtUB QAAIMET0MVZKBtUBHwAAgIYDAgAAAAAAwAAAAAAAAEYBAAAAHgAAAGEAYwBjAGUAcAB0AGwAYQBu AGcAdQBhAGcAZQAAAAAAAQAAAAwAAABlAG4ALQBVAFMAAAAfADcAAQAAAH4AAABbAFAAQQBUAEMA SABdACAAQgBhAHMAZQBUAG8AbwBsAHMAOgBFAG4AYQBiAGwAZQBzACAARgBGAFMAIAB0AG8AIABz AHUAcABwAG8AcgB0ACAAdABoAGUAIABHAFUASQBEACAAdgBhAGwAdQBlACAAZgBvAHIAbQBhAHQA AAAAAB8APQABAAAAAgAAAAAAAAADADYAAAAAAAIBcQABAAAAFgAAAAHVBkpVK1s79zOW60bojJHX QYiaxY0AAB8AcAABAAAAfgAAAFsAUABBAFQAQwBIAF0AIABCAGEAcwBlAFQAbwBvAGwAcwA6AEUA bgBhAGIAbABlAHMAIABGAEYAUwAgAHQAbwAgAHMAdQBwAHAAbwByAHQAIAB0AGgAZQAgAEcAVQBJ AEQAIAB2AGEAbAB1AGUAIABmAG8AcgBtAGEAdAAAAAAAHwA1EAEAAACQAAAAPABGAEEARAAwAEQA NwBFADAAQQBFADAARgBBADUANABEADkAOAA3AEYANgBFADcAMgA0ADMANQBDAEEARgBEADUAMABB AEYANQBEADgAQQAyAEAAUwBIAFMATQBTAFgAMQAwADEALgBjAGMAcgAuAGMAbwByAHAALgBpAG4A dABlAGwALgBjAG8AbQA+AAAAAwDeP59OAABAAAcwgDEtVkoG1QECAQsAAQAAABAAAAD/2TtX8/iI SJXfmXeSS+6zAwAmAAAAAAACAUcAAQAAADIAAABjPVVTO2E9TUNJO3A9SW50ZWw7bD1TSFNNU1gx MDEtMTkwNTA5MDkzNDAyWi05MjQ5AAAAAgEQMAEAAABGAAAAAAAAACZ3vTk77DhJpKYVPcule0IH APrQ1+CuD6VNmH9uckNcr9UAAABEEV4AAKaTaDaIdmxLp0rT60eaTGQAAAlUj28AAAAAHwD6PwEA AAAYAAAARgBhAG4ALAAgAFoAaABpAGoAdQBYAAAAAwAJWQEAAABAAACACCAGAAAAAADAAAAAAAAA RgAAAAC/hQAAgJMuVUoG1QELAACACCAGAAAAAADAAAAAAAAARgAAAACChQAAAAAAAB8AAICGAwIA AAAAAMAAAAAAAABGAQAAABgAAABkAGwAcAAtAHAAcgBvAGQAdQBjAHQAAAABAAAAGgAAAGQAbABw AGUALQB3AGkAbgBkAG8AdwBzAAAAAAAfAACAhgMCAAAAAADAAAAAAAAARgEAAAAYAAAAZABsAHAA LQB2AGUAcgBzAGkAbwBuAAAAAQAAABYAAAAxADEALgAwAC4ANgAwADAALgA3AAAAAAAfAACAhgMC AAAAAADAAAAAAAAARgEAAAAaAAAAZABsAHAALQByAGUAYQBjAHQAaQBvAG4AAAAAAAEAAAAUAAAA bgBvAC0AYQBjAHQAaQBvAG4AAAADAA00/T8AAB8AAICGAwIAAAAAAMAAAAAAAABGAQAAACAAAAB4 AC0AbQBzAC0AaABhAHMALQBhAHQAdABhAGMAaAAAAAEAAAACAAAAAAAAAB8AAICGAwIAAAAAAMAA AAAAAABGAQAAACIAAAB4AC0AbwByAGkAZwBpAG4AYQB0AGkAbgBnAC0AaQBwAAAAAAABAAAAIAAA AFsAMQAwAC4AMgAzADkALgAxADIANwAuADQAMABdAAAAegQ= --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF5D8A2SHSMSX101ccrcor_--