From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.65; helo=mga03.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (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 3A6F022571B32 for ; Fri, 16 Mar 2018 08:38:54 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Mar 2018 08:45:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,316,1517904000"; d="scan'208";a="42636652" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga002.jf.intel.com with ESMTP; 16 Mar 2018 08:45:19 -0700 Received: from fmsmsx126.amr.corp.intel.com (10.18.125.43) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.319.2; Fri, 16 Mar 2018 08:45:19 -0700 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by FMSMSX126.amr.corp.intel.com (10.18.125.43) with Microsoft SMTP Server (TLS) id 14.3.319.2; Fri, 16 Mar 2018 08:45:18 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.226]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.166]) with mapi id 14.03.0319.002; Fri, 16 Mar 2018 23:45:16 +0800 From: "Gao, Liming" To: "Feng, YunhuaX" , "edk2-devel@lists.01.org" Thread-Topic: [PATCH] BaseTools: --hash --binary-destination generate wrong binary path Thread-Index: AdO89K1pNaHZytFqQDGl5xk/BGd2WQASRcfw Date: Fri, 16 Mar 2018 15:45:15 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E1E811F@SHSMSX104.ccr.corp.intel.com> References: <47C64442C08CCD4089DC43B6B5E46BC4837AB7@shsmsx102.ccr.corp.intel.com> In-Reply-To: <47C64442C08CCD4089DC43B6B5E46BC4837AB7@shsmsx102.ccr.corp.intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.0.116 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH] BaseTools: --hash --binary-destination generate wrong binary path X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Mar 2018 15:38:55 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao > -----Original Message----- > From: Feng, YunhuaX > Sent: Friday, March 16, 2018 3:03 PM > To: edk2-devel@lists.01.org > Cc: Zhu, Yonghong ; Gao, Liming > Subject: [PATCH] BaseTools: --hash --binary-destination generate wrong bi= nary path >=20 > Option --hash --binary-destination generate Binaries section in > the inf file, but the path of ASL file is begin with > Output directory, so need replace Output directory with '', > will get the file name RamDisk.aml >=20 > Incorrect AML file path in inf file on linux: > [Binaries.X64] > PE32|RamDiskDxe.efi >=20 > ASL|home/tiano/Desktop/hash/edk2/Build/OvmfX64/RELEASE_GCC5/X64 > /MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe/OUTPUT/RamDisk.aml > DXE_DEPEX|RamDiskDxe.depex > BIN|RamDiskDxeOffset.bin >=20 > Cc: Liming Gao > Cc: Yonghong Zhu > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Yunhua Feng > --- > BaseTools/Source/Python/AutoGen/AutoGen.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Sourc= e/Python/AutoGen/AutoGen.py > index 439e360955..95e3e912b1 100644 > --- a/BaseTools/Source/Python/AutoGen/AutoGen.py > +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py > @@ -4062,11 +4062,11 @@ class ModuleAutoGen(AutoGen): > AsBuiltInfDict['module_pi_specification_version'] +=3D [self= .Specification['PI_SPECIFICATION_VERSION']] >=20 > OutputDir =3D self.OutputDir.replace('\\', '/').strip('/') > DebugDir =3D self.DebugDir.replace('\\', '/').strip('/') > for Item in self.CodaTargetList: > - File =3D Item.Target.Path.replace('\\', '/').strip('/').repl= ace(DebugDir, '').strip('/') > + File =3D Item.Target.Path.replace('\\', '/').strip('/').repl= ace(DebugDir, '').replace(OutputDir, '').strip('/') > if File not in self.OutputFile: > self.OutputFile.append(File) > if os.path.isabs(File): > File =3D File.replace('\\', '/').strip('/').replace(Outp= utDir, '').strip('/') > if Item.Target.Ext.lower() =3D=3D '.aml': > -- > 2.12.2.windows.2