From nobody Fri May 17 20:07:03 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+55927+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+55927+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1584440260; cv=none; d=zohomail.com; s=zohoarc; b=DOkN614n9AkzgsR5WcEkuhYJRytPPos6Fv3AV73p/xchI7BI2fg+bFQ6YvMIfei/udwS60J/DJmW4FARzUC3iYahVndziIX27Sjw7VHOrrQbvbzWO9va5Dp/Q9SCpSKqyQnzFL3zv1PtThg3BkdGD1ReTuQJQFSnv7bqoukTF7g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584440260; h=Cc:Date:From:List-Id:List-Unsubscribe:Message-ID:Reply-To:Sender:Subject:To; bh=yBnq785HHyvlJLujso5jXIR5UMShTqR3Ld7fXd2xSJc=; b=TekDFpvqHTMIQc7lS8X/qZteXZH5MMAGVfaU6M+7jZne5/Mp+k+KthXxYCRkW35SJDGvSJI3lxU/ENciuPSNFBBeb7IhzRaDm1u819NnTMjlbVLyO6DxEiKA5J+2Rxkb8IcJIepQ8vpgIZO7lrXMZbKqUhpH2IcdsZ2sBkkpARY= 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+55927+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 1584440260199354.5685156767869; Tue, 17 Mar 2020 03:17:40 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id ibncYY1788612xHu9gkYr1oq; Tue, 17 Mar 2020 03:17:39 -0700 X-Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web11.2578.1584440259321637480 for ; Tue, 17 Mar 2020 03:17:39 -0700 IronPort-SDR: pZ47kn8aTG2OKZ+nKBQ9c6gHmDbNN8+BTnvLxhYOBkli6uTBFU5CFWBvl+LrndsVm75lPx3cIa IbPGmECQT1Pg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2020 03:17:39 -0700 IronPort-SDR: Hx/h1ra6dvryiaSxdEeMcsUSucUXIFmCvw6jNg6CpaNbJPHBBElraMbX1GkHOOXDqPqj/Orjg7 cr2d/d7CLelA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,564,1574150400"; d="scan'208";a="267912740" X-Received: from zhijufax-mobl.ccr.corp.intel.com ([10.238.4.120]) by fmsmga004.fm.intel.com with ESMTP; 17 Mar 2020 03:17:37 -0700 From: "Fan, ZhijuX" To: devel@edk2.groups.io Cc: "Zhiju . Fan" , Liming Gao , Bob Feng Subject: [edk2-devel] [PATCH V3] BaseTools:GuidedSectionTools.txt is not generated correctly Date: Tue, 17 Mar 2020 18:17:13 +0800 Message-Id: <20200317101713.11188-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: co0DXGaXyPtp5dRuNzBiPIPzx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1584440259; bh=i0HWaoDEbWldZeiq4yXPmdSVgkFqEDx9P+5B0DrkZOw=; h=Cc:Date:From:Reply-To:Subject:To; b=W8ldHu/b8nmPk43hdC9WhLmBlhlbf4/jaDoiq9oSLDDL3A8Q5EFSXgQmNe1uwToWi8/ Ekqk6p+n+3dUyjaFg7xHVubtTD9CdF1E6lMCYcFaXStGs6aqxszSoN7C3f1VNhDdiodXO 2zouwIj7pEBXQlSvTS5P5CvJiQFuKUe61kA= 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 --- Change full path is only used on non-windows systems BaseTools/Source/Python/AutoGen/PlatformAutoGen.py | 4 +++- BaseTools/Source/Python/build/build.py | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py b/BaseTools= /Source/Python/AutoGen/PlatformAutoGen.py index d32178b00c93..478a5116fd7a 100644 --- a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py +++ b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py @@ -866,7 +866,9 @@ 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]) + if self.Workspace.ToolDef.ToolsDefTxtDictionar= y.get(Def): + self.Workspace.ToolDef.ToolsDefTxtDictiona= ry[Def] =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..4d4615c0e94a 100755 --- a/BaseTools/Source/Python/build/build.py +++ b/BaseTools/Source/Python/build/build.py @@ -2347,7 +2347,8 @@ class Build(): toolName =3D split[3] path =3D '_'.join(split[0:4]) + '_PATH' path =3D self.ToolDef.ToolsDefTxtDictionar= y[path] - path =3D self.GetFullPathOfTool(path) + if sys.platform !=3D "win32": + path =3D self.GetFullPathOfTool(path) guidAttribs.append((guid, toolName, path)) =20 # Write out GuidedSecTools.txt --=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 (#55927): https://edk2.groups.io/g/devel/message/55927 Mute This Topic: https://groups.io/mt/72020926/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-