From nobody Thu Apr 18 23:19:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+56377+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+56377+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1585209442; cv=none; d=zohomail.com; s=zohoarc; b=XMZTYhQytCXQFLuwNZs5GAL5ZcNgFIPXKzdxGh1dRcYBCjZPNRPa2Ac+2moaldpDkqbpuBlLwAqjscimw3Tgdsb1KSvUkTXinZGH8YQrZvkNrnQRbyq+ZN5GxuQAWU/5xDMKO8w+grhqzGyCN9MxO7yavHhblF7QAkK6IItkQwc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585209442; h=Cc:Date:From:List-Id:List-Unsubscribe:Message-ID:Reply-To:Sender:Subject:To; bh=0dqliVgOhqNEWZPCR2KXJ0y6ygnYZl6XtVJ7xLQQti8=; b=DbUFPsjbqpputFfSDKnKOJfBzz+khYyplx6dxxJIHbZzT8Tx9SCqgkpwEsVHlfDTFAFy9Bggyj3soMEM9vsURi0fcXlvsU1+SBtsQYJf7RCdKmIJHBdRrV//78PwNYRpF5msJni1+5qdIDEuyS88OHp5buxcCl48Wz3nMUdWnPE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+56377+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 1585209442677195.86018498249746; Thu, 26 Mar 2020 00:57:22 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id Eq05YY1788612xVbRYjYpmIi; Thu, 26 Mar 2020 00:57:22 -0700 X-Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web10.32441.1585209441861061463 for ; Thu, 26 Mar 2020 00:57:21 -0700 IronPort-SDR: oxVRoL9KqdtTDMwViWjdAWhMw53sUkq3e0sYLwn/cJfPuolYpi0YWGRvMWtTdDN95/d1tEPSen F70K/4b2aOOA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Mar 2020 00:57:21 -0700 IronPort-SDR: roUBguBoWXzmZeD/it/FoJ16V8die7Y+WAfsISZKbYf9TOWz7+t04+wVzTCnoOmASRl+BUs+7S DCwRQm9q4t/w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,307,1580803200"; d="scan'208";a="420604269" X-Received: from zhijufax-mobl.ccr.corp.intel.com ([10.238.4.120]) by orsmga005.jf.intel.com with ESMTP; 26 Mar 2020 00:57:19 -0700 From: "Fan, ZhijuX" To: devel@edk2.groups.io Cc: "Zhiju . Fan" , Liming Gao , Bob Feng Subject: [edk2-devel] [PATCH V5] BaseTools:GuidedSectionTools.txt is not generated correctly Date: Thu, 26 Mar 2020 15:56:43 +0800 Message-Id: <20200326075643.2516-1-zhijux.fan@intel.com> 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 X-Gm-Message-State: T7WATLZ6ME4LtYT9RbH9YLYTx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1585209442; bh=jLGuCS+C646fprcPu7UOLnH5se3EUkscFCH1dx2uJNg=; h=Cc:Date:From:Reply-To:Subject:To; b=rt50HBDh0nlgWeVU7QxxOJQ0XDxhlPEZrk1eBkjHxEZ+5uUZdqO5hwuBu6oY9xClwQ6 pfdRU1v98mXhrsiiWuGkggvb/CwKslY3GthwCa164zzpOn9wWaspscDkph9IC1wojti7m zUnLecJdVlO8aLf0f0G5ucD0+iaPrmxXnWU= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D2538 For LzmaCompress or BrotliCompress, the platform may use the different options and add their batch file, such as LzmaCompressPlatform. Then, specify it in platform.dsc [BuildOptions] to override the default one in tools_def.txt. *_*_*_LZMA_PATH =3D LzmaCompressPlatform This override tool will be used. But, its name is not specified in the generated GuidedSectionTools.txt. Signed-off-by: Zhiju.Fan Cc: Liming Gao Cc: Bob Feng --- A judgment condition was removed if self.Workspace.ToolDef.ToolsDefTxtDictionary.get(Def): BaseTools/Source/Python/AutoGen/PlatformAutoGen.py | 3 ++- BaseTools/Source/Python/build/build.py | 13 +++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py b/BaseTools= /Source/Python/AutoGen/PlatformAutoGen.py index d32178b00c93..af66c48c7d6a 100644 --- a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py +++ b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py @@ -866,7 +866,8 @@ class PlatformAutoGen(AutoGen): Value +=3D " " + self._BuildOptionWithToolDef(= RetVal)[Tool][Attr] else: Value =3D self._BuildOptionWithToolDef(RetVal)= [Tool][Attr] - + Def =3D '_'.join([self.BuildTarget, self.ToolC= hain, self.Arch, Tool, Attr]) + self.Workspace.ToolDef.ToolsDefTxtDictionary[D= ef] =3D Value if Attr =3D=3D "PATH": # Don't put MAKE definition in the file if Tool !=3D "MAKE": diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Pyth= on/build/build.py index d841fefdc502..6dbe05f0a93e 100755 --- a/BaseTools/Source/Python/build/build.py +++ b/BaseTools/Source/Python/build/build.py @@ -2363,16 +2363,9 @@ class Build(): if os.path.exists(tool): return os.path.realpath(tool) else: - # We need to search for the tool using the - # PATH environment variable. - for dirInPath in os.environ['PATH'].split(os.pathsep): - foundPath =3D os.path.join(dirInPath, tool) - if os.path.exists(foundPath): - return os.path.realpath(foundPath) - - # If the tool was not found in the path then we just return - # the input tool. - return tool + # If the tool was not found in the path then we just return + # the input tool. + return tool =20 ## Launch the module or platform build # --=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 (#56377): https://edk2.groups.io/g/devel/message/56377 Mute This Topic: https://groups.io/mt/72559525/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-