From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.24; helo=mga09.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 8402321EA15CC for ; Tue, 10 Oct 2017 21:44:33 -0700 (PDT) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Oct 2017 21:48:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.43,359,1503385200"; d="scan'208";a="1180775467" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by orsmga001.jf.intel.com with ESMTP; 10 Oct 2017 21:48:01 -0700 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 10 Oct 2017 21:47:58 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.152]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.213]) with mapi id 14.03.0319.002; Wed, 11 Oct 2017 12:47:57 +0800 From: "Gao, Liming" To: "Zhu, Yonghong" , "edk2-devel@lists.01.org" Thread-Topic: [Patch] BaseTools: Fix the Keyword error for in FDF File Thread-Index: AQHTQQOkYA/NKBMFXEK/DS3nFRbAZqLeFiFQ Date: Wed, 11 Oct 2017 04:47:56 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E169BAE@SHSMSX104.ccr.corp.intel.com> References: <1507556191-19544-1-git-send-email-yonghong.zhu@intel.com> In-Reply-To: <1507556191-19544-1-git-send-email-yonghong.zhu@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch] BaseTools: Fix the Keyword error for in FDF File X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Oct 2017 04:44:33 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao >-----Original Message----- >From: Zhu, Yonghong >Sent: Monday, October 09, 2017 9:37 PM >To: edk2-devel@lists.01.org >Cc: Gao, Liming >Subject: [Patch] BaseTools: Fix the Keyword error for in >FDF File > >current in FDF spec 3.6 [FV] section it use "FV_EXT_ENTRY_TYPE" as >Keyword for , while in the code it use "FV_EXT_ENTRY". >To keep compatibility, this patch support both keyword in the code >first. > >Cc: Liming Gao >Contributed-under: TianoCore Contribution Agreement 1.1 >Signed-off-by: Yonghong Zhu >--- > BaseTools/Source/Python/GenFds/FdfParser.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > >diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py >b/BaseTools/Source/Python/GenFds/FdfParser.py >index b95afc7..0190be8 100644 >--- a/BaseTools/Source/Python/GenFds/FdfParser.py >+++ b/BaseTools/Source/Python/GenFds/FdfParser.py >@@ -2363,11 +2363,11 @@ class FdfParser: > > return True > > def __GetFvExtEntryStatement(self, FvObj): > >- if not self.__IsKeyword( "FV_EXT_ENTRY"): >+ if not (self.__IsKeyword( "FV_EXT_ENTRY") or >self.__IsKeyword( "FV_EXT_ENTRY_TYPE")): > return False > > if not self.__IsKeyword ("TYPE"): > raise Warning("expected 'TYPE'", self.FileName, >self.CurrentLineNumber) > >-- >2.6.1.windows.1