From nobody Mon Feb 9 20:10:33 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+76905+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+76905+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1624433020; cv=none; d=zohomail.com; s=zohoarc; b=lW7hpSJ/4zMqeBSKAs8c/QuDvpdNnq1cojs9UHrF7Ox1HgxNKWf61Wvyu9X1Ia8y02DLhBx8Oc9cCs062LWmgKtls1RlkM8yHOXOTL7pDpiWDHZrVkN6fVOheWwjQQZZJyCeGa36QxiNnVamC6WdVeH81JYH6vKFtLecADXmFv0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624433020; h=Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=tNtczed7XiTGD0OtPdTKNcuK/M1gzWzX5RqIMKXbtEQ=; b=kLYgZdAzCSs6A6aJ9/fAHuvn5Na7qztvDQBAjMbezLhP2nPpDG2rNVhn8NQkK6HtDNOVEekt833q5ZD+ExuKIZXj1pLnNxR4m/iIFdvJnSgDKzfvWc2ZD4sUZmM7BBjXMqQ1WDHeqhT3OqIRh9DcJk0OQKmpWY+VByz5ytY4gAc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+76905+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1624433019953976.6541529722903; Wed, 23 Jun 2021 00:23:39 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id MreaYY1788612xWMsbBheLoc; Wed, 23 Jun 2021 00:23:38 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web12.4394.1624433016573655187 for ; Wed, 23 Jun 2021 00:23:37 -0700 X-Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 220681063; Wed, 23 Jun 2021 00:23:31 -0700 (PDT) X-Received: from e120189.arm.com (unknown [10.57.78.245]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 7FEF03F719; Wed, 23 Jun 2021 00:23:29 -0700 (PDT) From: "PierreGondois" To: devel@edk2.groups.io, Sean Brogan , Bret Barkelew , Michael D Kinney , Liming Gao , Sami Mujawar Subject: [edk2-devel] [PATCH v1 1/4] .pytool/EccCheck: Locate BaseTools dir with EDK_TOOLS_PATH Date: Wed, 23 Jun 2021 08:22:47 +0100 Message-Id: <20210623072250.3277-2-Pierre.Gondois@arm.com> In-Reply-To: <20210623072250.3277-1-Pierre.Gondois@arm.com> References: <20210623072250.3277-1-Pierre.Gondois@arm.com> Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,pierre.gondois@arm.com X-Gm-Message-State: G42UK3Mk5JBq4YDLKDgH9h8Lx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1624433018; bh=qcTxvAcSrGe86xDvBwr+f/GRoRRJcwEyY8VjJPCWDq4=; h=Date:From:Reply-To:Subject:To; b=PsjCzsQDAcoVT82s8plulBb5LXGQFBkO9XIVvj2KXqe26dQs6n1r8Wlsyp0KiHPOI+4 Krs4ysxB+KJaf53ZWWoKlvrdgE5FPI9NE8R7TQnVbdIbvKsXaWNTm1mUTWq3UOYNuqPBY UxMYGzoTeAhuGQm0T7+yxuNlObm/bQoX3sU= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Pierre Gondois The BaseTools directory is currently being located as a sub-directory of the WORKSPACE env var. This might not be true in other environments. Cf EDKII Build Specification, s4.1.3 "Build Process Restrictions": There is no restriction on the location of the EDK_TOOLS_PATH, it may be located within a directory identified as the WORKSPACE directory, or in any other location that is accessible on the development workstation. Locate the BaseTools directory using EDK_TOOLS_PATH instead. Cc: Sean Brogan Cc: Bret Barkelew Cc: Michael D Kinney Cc: Liming Gao Cc: Sami Mujawar Signed-off-by: Pierre Gondois --- .pytool/Plugin/EccCheck/EccCheck.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.pytool/Plugin/EccCheck/EccCheck.py b/.pytool/Plugin/EccCheck/= EccCheck.py index eee1ff7a77b5..bb93446441de 100644 --- a/.pytool/Plugin/EccCheck/EccCheck.py +++ b/.pytool/Plugin/EccCheck/EccCheck.py @@ -1,5 +1,6 @@ # @file EccCheck.py # +# Copyright (c) 2021, Arm Limited. All rights reserved.
# Copyright (c) 2020, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent ## @@ -61,16 +62,17 @@ class EccCheck(ICiBuildPlugin): # - output_stream the StringIO output stream from this plugin via lo= gging def RunBuildPlugin(self, packagename, Edk2pathObj, pkgconfig, environm= ent, PLM, PLMHelper, tc, output_stream=3DNone): edk2_path =3D Edk2pathObj.WorkspacePath - python_path =3D os.path.join(edk2_path, "BaseTools", "Source", "Py= thon") + basetools_path =3D environment.GetValue("EDK_TOOLS_PATH") + python_path =3D os.path.join(basetools_path, "Source", "Python") env =3D shell_environment.GetEnvironment() env.set_shell_var('PYTHONPATH', python_path) env.set_shell_var('WORKSPACE', edk2_path) self.ECC_PASS =3D True - self.ApplyConfig(pkgconfig, edk2_path, packagename) + self.ApplyConfig(pkgconfig, edk2_path, basetools_path, packagename) modify_dir_list =3D self.GetModifyDir(packagename) patch =3D self.GetDiff(packagename) ecc_diff_range =3D self.GetDiffRange(patch, packagename, edk2_path) - self.GenerateEccReport(modify_dir_list, ecc_diff_range, edk2_path) + self.GenerateEccReport(modify_dir_list, ecc_diff_range, edk2_path,= basetools_path) ecc_log =3D os.path.join(edk2_path, "Ecc.log") self.RevertCode() if self.ECC_PASS: @@ -176,11 +178,11 @@ class EccCheck(ICiBuildPlugin): return comment_range =20 def GenerateEccReport(self, modify_dir_list: List[str], ecc_diff_range= : Dict[str, List[Tuple[int, int]]], - edk2_path: str) -> None: + edk2_path: str, basetools_path: str) -> None: ecc_need =3D False ecc_run =3D True - config =3D os.path.join(edk2_path, "BaseTools", "Source", "Python"= , "Ecc", "config.ini") - exception =3D os.path.join(edk2_path, "BaseTools", "Source", "Pyth= on", "Ecc", "exception.xml") + config =3D os.path.join(basetools_path, "Source", "Python", "Ecc",= "config.ini") + exception =3D os.path.join(basetools_path, "Source", "Python", "Ec= c", "exception.xml") report =3D os.path.join(edk2_path, "Ecc.csv") for modify_dir in modify_dir_list: target =3D os.path.join(edk2_path, modify_dir) @@ -234,7 +236,7 @@ class EccCheck(ICiBuildPlugin): log.writelines(all_line) return =20 - def ApplyConfig(self, pkgconfig: Dict[str, List[str]], edk2_path: str,= pkg: str) -> None: + def ApplyConfig(self, pkgconfig: Dict[str, List[str]], edk2_path: str,= basetools_path: str, pkg: str) -> None: if "IgnoreFiles" in pkgconfig: for a in pkgconfig["IgnoreFiles"]: a =3D os.path.join(edk2_path, pkg, a) @@ -251,7 +253,7 @@ class EccCheck(ICiBuildPlugin): =20 if "ExceptionList" in pkgconfig: exception_list =3D pkgconfig["ExceptionList"] - exception_xml =3D os.path.join(edk2_path, "BaseTools", "Source= ", "Python", "Ecc", "exception.xml") + exception_xml =3D os.path.join(basetools_path, "Source", "Pyth= on", "Ecc", "exception.xml") try: logging.info("Appending exceptions") self.AppendException(exception_list, exception_xml) --=20 2.17.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 (#76905): https://edk2.groups.io/g/devel/message/76905 Mute This Topic: https://groups.io/mt/83732990/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-