From nobody Tue Dec 24 16:52:28 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1513063653031124.58415648700668; Mon, 11 Dec 2017 23:27:33 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id C1968221EA0C0; Mon, 11 Dec 2017 23:22:53 -0800 (PST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (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 83EEC21A1098A for ; Mon, 11 Dec 2017 23:22:52 -0800 (PST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Dec 2017 23:27:30 -0800 Received: from shwdeopenpsi168.ccr.corp.intel.com ([10.239.158.129]) by orsmga002.jf.intel.com with ESMTP; 11 Dec 2017 23:27:29 -0800 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Permerror (SPF Permanent Error: More than 10 MX records returned) identity=mailfrom; client-ip=192.55.52.93; helo=mga11.intel.com; envelope-from=yonghong.zhu@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,394,1508828400"; d="scan'208";a="17516450" From: Yonghong Zhu To: edk2-devel@lists.01.org Date: Tue, 12 Dec 2017 15:27:22 +0800 Message-Id: <1513063644-6040-2-git-send-email-yonghong.zhu@intel.com> X-Mailer: git-send-email 2.6.1.windows.1 In-Reply-To: <1513063644-6040-1-git-send-email-yonghong.zhu@intel.com> References: <1513063644-6040-1-git-send-email-yonghong.zhu@intel.com> Subject: [edk2] [Patch 1/3 V2] BaseTools: Not cache the .efi file location into build option 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: , Cc: Liming Gao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" We don't need cache the .efi file location into build option, otherwise when we change the --binary-destination location, it would cause the hash value is different. Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Yonghong Zhu Reviewed-by: Liming Gao --- BaseTools/Source/Python/AutoGen/AutoGen.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/= Python/AutoGen/AutoGen.py index 1c4c395..8ad385a 100644 --- a/BaseTools/Source/Python/AutoGen/AutoGen.py +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py @@ -684,13 +684,10 @@ class WorkspaceAutoGen(AutoGen): content +=3D os.linesep if self.FdfFile: content +=3D 'Flash Image Definition: ' content +=3D str(self.FdfFile) content +=3D os.linesep - if GlobalData.gBinCacheDest: - content +=3D 'Cache of .efi location: ' - content +=3D str(GlobalData.gBinCacheDest) SaveFileOnChange(os.path.join(self.BuildDir, 'BuildOptions'), cont= ent, False) =20 # # Create PcdToken Number file for Dynamic/DynamicEx Pcd. # --=20 2.6.1.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Tue Dec 24 16:52:28 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1513063656357367.7820801025749; Mon, 11 Dec 2017 23:27:36 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 12103221EA0D4; Mon, 11 Dec 2017 23:22:57 -0800 (PST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (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 AE26921A1098A for ; Mon, 11 Dec 2017 23:22:55 -0800 (PST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Dec 2017 23:27:34 -0800 Received: from shwdeopenpsi168.ccr.corp.intel.com ([10.239.158.129]) by orsmga002.jf.intel.com with ESMTP; 11 Dec 2017 23:27:32 -0800 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Permerror (SPF Permanent Error: More than 10 MX records returned) identity=mailfrom; client-ip=192.55.52.93; helo=mga11.intel.com; envelope-from=yonghong.zhu@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,394,1508828400"; d="scan'208";a="17516460" From: Yonghong Zhu To: edk2-devel@lists.01.org Date: Tue, 12 Dec 2017 15:27:23 +0800 Message-Id: <1513063644-6040-3-git-send-email-yonghong.zhu@intel.com> X-Mailer: git-send-email 2.6.1.windows.1 In-Reply-To: <1513063644-6040-1-git-send-email-yonghong.zhu@intel.com> References: <1513063644-6040-1-git-send-email-yonghong.zhu@intel.com> Subject: [edk2] [Patch 2/3 V2] BaseTools: back up the binary files when hash value is same 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: , Cc: Liming Gao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" V2: change to use InfBuildData but not ModuleAutoGen We meet the case that first build with --hash option, then build it again with --hash and --binary-destination option, since the hash value is same, tool will not build the driver again, it cause the binary files are not backed up. Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Yonghong Zhu Reviewed-by: Liming Gao --- BaseTools/Source/Python/AutoGen/AutoGen.py | 13 +++++++++++-- BaseTools/Source/Python/build/build.py | 5 +++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/= Python/AutoGen/AutoGen.py index 8ad385a..b00390c 100644 --- a/BaseTools/Source/Python/AutoGen/AutoGen.py +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py @@ -3836,11 +3836,17 @@ class ModuleAutoGen(AutoGen): fInputfile.close () return OutputName =20 ## Create AsBuilt INF file the module # - def CreateAsBuiltInf(self): + def CreateAsBuiltInf(self, IsOnlyCopy =3D False): + self.OutputFile =3D [] + if IsOnlyCopy: + if GlobalData.gBinCacheDest: + self.CopyModuleToCache() + return + if self.IsAsBuiltInfCreated: return =20 # Skip the following code for EDK I inf if self.AutoGenVersion < 0x00010005: @@ -3969,11 +3975,10 @@ class ModuleAutoGen(AutoGen): AsBuiltInfDict['module_uefi_specification_version'] +=3D [self= .Specification['UEFI_SPECIFICATION_VERSION']] if 'PI_SPECIFICATION_VERSION' in self.Specification: AsBuiltInfDict['module_pi_specification_version'] +=3D [self.S= pecification['PI_SPECIFICATION_VERSION']] =20 OutputDir =3D self.OutputDir.replace('\\', '/').strip('/') - self.OutputFile =3D [] for Item in self.CodaTargetList: File =3D Item.Target.Path.replace('\\', '/').strip('/').replac= e(OutputDir, '').strip('/') if File not in self.OutputFile: self.OutputFile.append(File) if Item.Target.Ext.lower() =3D=3D '.aml': @@ -4196,12 +4201,16 @@ class ModuleAutoGen(AutoGen): ModuleFile =3D path.join(self.OutputDir, self.Name + '.inf') if os.path.exists(HashFile): shutil.copy2(HashFile, FileDir) if os.path.exists(ModuleFile): shutil.copy2(ModuleFile, FileDir) + if not self.OutputFile: + Ma =3D self.Workspace.BuildDatabase[PathClass(ModuleFile), sel= f.Arch, self.BuildTarget, self.ToolChain] + self.OutputFile =3D Ma.Binaries if self.OutputFile: for File in self.OutputFile: + File =3D str(File) if not os.path.isabs(File): File =3D os.path.join(self.OutputDir, File) if os.path.exists(File): shutil.copy2(File, FileDir) =20 diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Pyth= on/build/build.py index f94285a..457f6c9 100644 --- a/BaseTools/Source/Python/build/build.py +++ b/BaseTools/Source/Python/build/build.py @@ -823,10 +823,11 @@ class Build(): self.Platform =3D None self.ToolChainFamily =3D None self.LoadFixAddress =3D 0 self.UniFlag =3D BuildOptions.Flag self.BuildModules =3D [] + self.HashSkipModules =3D [] self.Db_Flag =3D False self.LaunchPrebuildFlag =3D False self.PlatformBuildPath =3D os.path.join(GlobalData.gConfDirectory,= '.cache', '.PlatformBuild') if BuildOptions.CommandLength: GlobalData.gCommandMaxLength =3D BuildOptions.CommandLength @@ -2014,10 +2015,11 @@ class Build(): Ma =3D ModuleAutoGen(Wa, Module, BuildTarget, Tool= Chain, Arch, self.PlatformFile) =20 if Ma =3D=3D None: continue if Ma.CanSkipbyHash(): + self.HashSkipModules.append(Ma) continue =20 # Not to auto-gen for targets 'clean', 'cleanlib',= 'cleanall', 'run', 'fds' if self.Target not in ['clean', 'cleanlib', 'clean= all', 'run', 'fds']: # for target which must generate AutoGen code = and makefile @@ -2212,11 +2214,14 @@ class Build(): RemoveDirectory(os.path.dirname(GlobalData.gDatabasePath), Tru= e) =20 def CreateAsBuiltInf(self): for Module in self.BuildModules: Module.CreateAsBuiltInf() + for Module in self.HashSkipModules: + Module.CreateAsBuiltInf(True) self.BuildModules =3D [] + self.HashSkipModules =3D [] ## Do some clean-up works when error occurred def Relinquish(self): OldLogLevel =3D EdkLogger.GetLevel() EdkLogger.SetLevel(EdkLogger.ERROR) #self.DumpBuildData() --=20 2.6.1.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Tue Dec 24 16:52:28 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1513063666617321.39626931048053; Mon, 11 Dec 2017 23:27:46 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 4E7A6221EA0BB; Mon, 11 Dec 2017 23:23:07 -0800 (PST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 5165C21A1098A for ; Mon, 11 Dec 2017 23:23:05 -0800 (PST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Dec 2017 23:27:43 -0800 Received: from shwdeopenpsi168.ccr.corp.intel.com ([10.239.158.129]) by orsmga002.jf.intel.com with ESMTP; 11 Dec 2017 23:27:39 -0800 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Permerror (SPF Permanent Error: More than 10 MX records returned) identity=mailfrom; client-ip=192.55.52.88; helo=mga01.intel.com; envelope-from=yonghong.zhu@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,394,1508828400"; d="scan'208";a="17516481" From: Yonghong Zhu To: edk2-devel@lists.01.org Date: Tue, 12 Dec 2017 15:27:24 +0800 Message-Id: <1513063644-6040-4-git-send-email-yonghong.zhu@intel.com> X-Mailer: git-send-email 2.6.1.windows.1 In-Reply-To: <1513063644-6040-1-git-send-email-yonghong.zhu@intel.com> References: <1513063644-6040-1-git-send-email-yonghong.zhu@intel.com> Subject: [edk2] [Patch 3/3 V2] BaseTools: enable hash value check for single module build 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: , Cc: Liming Gao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This patch enables hash value check for single module build to decide whether we can skip to build this module. Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Yonghong Zhu Reviewed-by: Liming Gao --- BaseTools/Source/Python/build/build.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Pyth= on/build/build.py index 457f6c9..8cf139c 100644 --- a/BaseTools/Source/Python/build/build.py +++ b/BaseTools/Source/Python/build/build.py @@ -1843,10 +1843,14 @@ class Build(): Pa =3D PlatformAutoGen(Wa, self.PlatformFile, BuildTar= get, ToolChain, Arch) for Module in Pa.Platform.Modules: if self.ModuleFile.Dir =3D=3D Module.Dir and self.= ModuleFile.Name =3D=3D Module.Name: Ma =3D ModuleAutoGen(Wa, Module, BuildTarget, = ToolChain, Arch, self.PlatformFile) if Ma =3D=3D None: continue + MaList.append(Ma) + if Ma.CanSkipbyHash(): + self.HashSkipModules.append(Ma) + continue # Not to auto-gen for targets 'clean', 'cleanl= ib', 'cleanall', 'run', 'fds' if self.Target not in ['clean', 'cleanlib', 'c= leanall', 'run', 'fds']: # for target which must generate AutoGen c= ode and makefile if not self.SkipAutoGen or self.Target =3D= =3D 'genc': Ma.CreateCodeFile(True) @@ -1854,11 +1858,10 @@ class Build(): if CmdListDict and self.Fdf and (Modul= e.File, Arch) in CmdListDict: Ma.CreateMakeFile(True, CmdListDic= t[Module.File, Arch]) del CmdListDict[Module.File, Arch] else: Ma.CreateMakeFile(True) - MaList.append(Ma) self.BuildModules.append(Ma) self.AutoGenTime +=3D int(round((time.time() - AutoGen= Start))) MakeStart =3D time.time() for Ma in self.BuildModules: if not Ma.IsBinaryModule: --=20 2.6.1.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel