From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=209.132.183.28; helo=mx1.redhat.com; envelope-from=lersek@redhat.com; receiver=edk2-devel@lists.01.org Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (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 CFD19211B736F for ; Tue, 15 Jan 2019 03:45:20 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5F5E258E3E; Tue, 15 Jan 2019 11:45:20 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-50.rdu2.redhat.com [10.10.120.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6CF4F608E7; Tue, 15 Jan 2019 11:45:19 +0000 (UTC) To: "Feng, Bob C" , edk2-devel@lists.01.org Cc: Liming Gao References: <20190115110313.24660-1-bob.c.feng@intel.com> From: Laszlo Ersek Message-ID: <762ddfb4-4a10-7dcf-1808-59dc530ef999@redhat.com> Date: Tue, 15 Jan 2019 12:45:18 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20190115110313.24660-1-bob.c.feng@intel.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 15 Jan 2019 11:45:20 +0000 (UTC) Subject: Re: [Patch] BaseTools: Remove EDK_SOURCE keyword from Inf Parser. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2019 11:45:21 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Hi Bob, On 01/15/19 12:03, Feng, Bob C wrote: > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1350 > Remove unused EDK_SOURCE keyword from Inf Parser. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Bob Feng > Cc: Liming Gao > --- > .../Source/Python/Workspace/InfBuildData.py | 34 ++++--------------- > 1 file changed, 7 insertions(+), 27 deletions(-) > > diff --git a/BaseTools/Source/Python/Workspace/InfBuildData.py b/BaseTools/Source/Python/Workspace/InfBuildData.py > index 02d6c1c756..709854de1e 100644 > --- a/BaseTools/Source/Python/Workspace/InfBuildData.py > +++ b/BaseTools/Source/Python/Workspace/InfBuildData.py > @@ -634,38 +634,18 @@ class InfBuildData(ModuleBuildClassObject): > > Macros = self._Macros > Macros['PROCESSOR'] = GlobalData.gEdkGlobal.get('PROCESSOR', self._Arch) > RecordList = self._RawData[MODEL_EFI_INCLUDE, self._Arch, self._Platform] > for Record in RecordList: > - if Record[0].find('EDK_SOURCE') > -1: > - File = NormPath(Record[0], self._Macros) > - if File[0] == '.': > - File = os.path.join(self._ModuleDir, File) > - else: > - File = os.path.join(GlobalData.gWorkspace, File) > - File = RealPath(os.path.normpath(File)) > - if File: > - RetVal.append(File) > - > - # TRICK: let compiler to choose correct header file > - File = NormPath(Record[0], self._Macros) > - if File[0] == '.': > - File = os.path.join(self._ModuleDir, File) > - else: > - File = os.path.join(GlobalData.gWorkspace, File) > - File = RealPath(os.path.normpath(File)) > - if File: > - RetVal.append(File) > + File = NormPath(Record[0], Macros) > + if File[0] == '.': > + File = os.path.join(self._ModuleDir, File) > else: > - File = NormPath(Record[0], Macros) > - if File[0] == '.': > - File = os.path.join(self._ModuleDir, File) > - else: > - File = mws.join(GlobalData.gWorkspace, File) > - File = RealPath(os.path.normpath(File)) > - if File: > - RetVal.append(File) > + File = mws.join(GlobalData.gWorkspace, File) > + File = RealPath(os.path.normpath(File)) > + if File: > + RetVal.append(File) > return RetVal > > ## Retrieve packages this module depends on > @cached_property > def Packages(self): > again, if this patch has been identically extracted from http://mid.mail-archive.com/20190114111341.20784-1-bob.c.feng@intel.com then you can add Tested-by: Laszlo Ersek Thanks, Laszlo