[v2] BaseTools: Enhance binary file in [Binaries] section use relative path

[edk2] [Patch V2] BaseTools: Enhance binary file in [Binaries] section use relative path

Posted by Yonghong Zhu 6 years, 9 months ago

V2: make sure the relative path base on the Asbuilt inf path

Enhance the binary file in Asbuilt inf file [Binaries] section use
relative path.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
---
 BaseTools/Source/Python/AutoGen/AutoGen.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index 998a733..013ca9d 100644
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -4151,10 +4151,12 @@ class ModuleAutoGen(AutoGen):
         DebugDir = self.DebugDir.replace('\\', '/').strip('/')
         for Item in self.CodaTargetList:
             File = Item.Target.Path.replace('\\', '/').strip('/').replace(DebugDir, '').strip('/')
             if File not in self.OutputFile:
                 self.OutputFile.append(File)
+            if os.path.isabs(File):
+                File = File.replace('\\', '/').strip('/').replace(OutputDir, '').strip('/')
             if Item.Target.Ext.lower() == '.aml':
                 AsBuiltInfDict['binary_item'] += ['ASL|' + File]
             elif Item.Target.Ext.lower() == '.acpi':
                 AsBuiltInfDict['binary_item'] += ['ACPI|' + File]
             elif Item.Target.Ext.lower() == '.efi':
-- 
2.6.1.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [Patch V2] BaseTools: Enhance binary file in [Binaries] section use relative path

Posted by Gao, Liming 6 years, 9 months ago

Reviewed-by: Liming Gao <liming.gao@intel.com>

> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Yonghong Zhu
> Sent: Monday, January 22, 2018 6:05 PM
> To: edk2-devel@lists.01.org
> Subject: [edk2] [Patch V2] BaseTools: Enhance binary file in [Binaries] section use relative path
> 
> V2: make sure the relative path base on the Asbuilt inf path
> 
> Enhance the binary file in Asbuilt inf file [Binaries] section use
> relative path.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
> ---
>  BaseTools/Source/Python/AutoGen/AutoGen.py | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
> index 998a733..013ca9d 100644
> --- a/BaseTools/Source/Python/AutoGen/AutoGen.py
> +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
> @@ -4151,10 +4151,12 @@ class ModuleAutoGen(AutoGen):
>          DebugDir = self.DebugDir.replace('\\', '/').strip('/')
>          for Item in self.CodaTargetList:
>              File = Item.Target.Path.replace('\\', '/').strip('/').replace(DebugDir, '').strip('/')
>              if File not in self.OutputFile:
>                  self.OutputFile.append(File)
> +            if os.path.isabs(File):
> +                File = File.replace('\\', '/').strip('/').replace(OutputDir, '').strip('/')
>              if Item.Target.Ext.lower() == '.aml':
>                  AsBuiltInfDict['binary_item'] += ['ASL|' + File]
>              elif Item.Target.Ext.lower() == '.acpi':
>                  AsBuiltInfDict['binary_item'] += ['ACPI|' + File]
>              elif Item.Target.Ext.lower() == '.efi':
> --
> 2.6.1.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel