[edk2-devel] [PATCH v3 0/4] Compile AML bytecode array into OBJ file
PierreGondois
pierre.gondois at arm.com
Sun Jun 28 22:12:04 UTC 2020
Hello Bob,
The PR729 didn't pass the PatchCheck for the patch adding the LF line endings to the script in BaseTools/BinWrappers/PosixLike, this is for the patch named "BaseTools: Rename AmlToHex script to AmlToC" (cf the following link: https://dev.azure.com/tianocore/edk2-ci/_build/results?buildId=8860&view=logs&j=12f1170f-54f2-53f3-20dd-22fc7dff55f9&t=9c939e41-62c2-5605-5e05-fc3554afc9f5&l=76).
However, I thought it was a normal behaviour. Indeed, PatchCheck.py is triggering an error for any file with LF line endings, except when:
- the file has a ".sh" extension
- the filename is in .gitmodules (it is coming from another git repo)
- the file mode of the file is 160000 (it is coming from another git repo)
The new AmlToC posix script doesn't match any of these conditions. However some other files are in the same conditions. I searched the files containing the "#!usr/bin/env" string and which don't have a ".sh" extension. I tried to run the PatchCheck.py script on their respective commit with the version of PatchCheck.py that existed at that time and the same CRLF error appeared. The list of these files is at the end of the mail. Renaming them with a ".sh" extension would break the build on linux: the extension of the file is important to locate a file. This is not the case on windows (and this explains why all the scripts in BaseTools\BinWrappers\WindowsLike have a .bat extension).
All the bash scripts not having a ".sh" extension are located in BaseTools/Bin/CYGWIN_NT-5.1-i686/ or BaseTools/BinWrappers/PosixLike/ . A solution would be to add an exception to the CRLF check for these two folders.
A small question: when applying the patch set, did BaseTools\BinWrappers\PosixLike\AmlToC have CRLF line endings and you had to manually modify them to linux line endings, or where the line endings already correct (linux LF line endings)?
Regards,
Pierre
The list of bash scripts without a ".sh" extension:
BaseTools/Bin/CYGWIN_NT-5.1-i686/BootSectImage
commit 5e407648358d639ed19d228303527133e4c95c25
Date: 2016-01-20T05:12:02+00:00
BaseTools/Bin/CYGWIN_NT-5.1-i686/build
commit 7aef7b7cbf16f79fb17c5ace98b1bc7f15bb90fa
Date: 2018-12-28T16:25:04+08:00
BaseTools/Bin/CYGWIN_NT-5.1-i686/BuildEnv
commit 66a2dc96d3dff90b4243c4ed3e7eaa33abdcdf3c
Date: 2012-02-15T08:06:01+00:00
BaseTools/Bin/CYGWIN_NT-5.1-i686/Ecc
commit 7aef7b7cbf16f79fb17c5ace98b1bc7f15bb90fa
Date: 2018-12-28T16:25:04+08:00
BaseTools/Bin/CYGWIN_NT-5.1-i686/EfiLdrImage
commit 5e407648358d639ed19d228303527133e4c95c25
Date: 2016-01-20T05:12:02+00:00
BaseTools/Bin/CYGWIN_NT-5.1-i686/EfiRom
commit 5e407648358d639ed19d228303527133e4c95c25
Date: 2016-01-20T05:12:02+00:00
BaseTools/Bin/CYGWIN_NT-5.1-i686/GenCrc32
commit 5e407648358d639ed19d228303527133e4c95c25
Date: 2016-01-20T05:12:02+00:00
BaseTools/Bin/CYGWIN_NT-5.1-i686/GenDepex
commit 7aef7b7cbf16f79fb17c5ace98b1bc7f15bb90fa
Date: 2018-12-28T16:25:04+08:00
BaseTools/Bin/CYGWIN_NT-5.1-i686/GenFds
commit 7aef7b7cbf16f79fb17c5ace98b1bc7f15bb90fa
Date: 2018-12-28T16:25:04+08:00
BaseTools/Bin/CYGWIN_NT-5.1-i686/GenFfs
commit 5e407648358d639ed19d228303527133e4c95c25
Date: 2016-01-20T05:12:02+00:00
BaseTools/Bin/CYGWIN_NT-5.1-i686/GenFv
commit 5e407648358d639ed19d228303527133e4c95c25
Date: 2016-01-20T05:12:02+00:00
BaseTools/Bin/CYGWIN_NT-5.1-i686/GenFw
commit 5e407648358d639ed19d228303527133e4c95c25
Date: 2016-01-20T05:12:02+00:00
BaseTools/Bin/CYGWIN_NT-5.1-i686/GenPage
commit 5e407648358d639ed19d228303527133e4c95c25
Date: 2016-01-20T05:12:02+00:00
BaseTools/Bin/CYGWIN_NT-5.1-i686/GenSec
commit 5e407648358d639ed19d228303527133e4c95c25
Date: 2016-01-20T05:12:02+00:00
BaseTools/Bin/CYGWIN_NT-5.1-i686/GenVtf
commit 5e407648358d639ed19d228303527133e4c95c25
Date: 2016-01-20T05:12:02+00:00
BaseTools/Bin/CYGWIN_NT-5.1-i686/GnuGenBootSector
commit 5e407648358d639ed19d228303527133e4c95c25
Date: 2016-01-20T05:12:02+00:00
BaseTools/Bin/CYGWIN_NT-5.1-i686/LzmaCompress
commit 5e407648358d639ed19d228303527133e4c95c25
Date: 2016-01-20T05:12:02+00:00
BaseTools/Bin/CYGWIN_NT-5.1-i686/LzmaF86Compress
commit 2e351cbe8e190271b3716284fc1076551d005472
Date: 2019-04-03T16:03:11-07:00
BaseTools/Bin/CYGWIN_NT-5.1-i686/RunBinToolFromBuildDir
commit 66a2dc96d3dff90b4243c4ed3e7eaa33abdcdf3c
Date: 2012-02-15T08:06:01+00:00
BaseTools/Bin/CYGWIN_NT-5.1-i686/RunToolFromSource
commit 66a2dc96d3dff90b4243c4ed3e7eaa33abdcdf3c
Date: 2012-02-15T08:06:01+00:00
BaseTools/Bin/CYGWIN_NT-5.1-i686/Split
commit 5e407648358d639ed19d228303527133e4c95c25
Date: 2016-01-20T05:12:02+00:00
BaseTools/Bin/CYGWIN_NT-5.1-i686/TargetTool
commit 7aef7b7cbf16f79fb17c5ace98b1bc7f15bb90fa
Date: 2018-12-28T16:25:04+08:00
BaseTools/Bin/CYGWIN_NT-5.1-i686/TianoCompress
commit 5e407648358d639ed19d228303527133e4c95c25
Date: 2016-01-20T05:12:02+00:00
BaseTools/Bin/CYGWIN_NT-5.1-i686/Trim
commit 7aef7b7cbf16f79fb17c5ace98b1bc7f15bb90fa
Date: 2018-12-28T16:25:04+08:00
BaseTools/Bin/CYGWIN_NT-5.1-i686/VfrCompile
commit 5e407648358d639ed19d228303527133e4c95c25
Date: 2016-01-20T05:12:02+00:00
BaseTools/Bin/CYGWIN_NT-5.1-i686/VolInfo
commit 5e407648358d639ed19d228303527133e4c95c25
Date: 2016-01-20T05:12:02+00:00
BaseTools/BinWrappers/PosixLike/AmlToC
commit 68fe454598fea8472f65283656c4e9abe06dadb3 (HEAD -> pg/803_Compile_AML_bytecode_array_into_OBJ_file)
Date: 2020-06-25T13:44:09+01:00
BaseTools/BinWrappers/PosixLike/BPDG
commit 7aef7b7cbf16f79fb17c5ace98b1bc7f15bb90fa
Date: 2018-12-28T16:25:04+08:00
BaseTools/BinWrappers/PosixLike/Brotli
commit de87f23291620d36d69ec55ea53a1c38b8780f0b
Date: 2017-03-30T16:23:10+08:00
BaseTools/BinWrappers/PosixLike/BrotliCompress
commit 2e351cbe8e190271b3716284fc1076551d005472
Date: 2019-04-03T16:03:11-07:00
BaseTools/BinWrappers/PosixLike/build
commit 7aef7b7cbf16f79fb17c5ace98b1bc7f15bb90fa
Date: 2018-12-28T16:25:04+08:00
BaseTools/BinWrappers/PosixLike/DevicePath
commit 7dbc50bd244d95fdc1741b9cfc561f0bfd724de1
Date: 2017-12-27T14:12:29+08:00
BaseTools/BinWrappers/PosixLike/Ecc
commit 7aef7b7cbf16f79fb17c5ace98b1bc7f15bb90fa
Date: 2018-12-28T16:25:04+08:00
BaseTools/BinWrappers/PosixLike/EfiRom
commit 5e407648358d639ed19d228303527133e4c95c25
Date: 2016-01-20T05:12:02+00:00
BaseTools/BinWrappers/PosixLike/GenCrc32
commit 5e407648358d639ed19d228303527133e4c95c25
Date: 2016-01-20T05:12:02+00:00
BaseTools/BinWrappers/PosixLike/GenDepex
commit 7aef7b7cbf16f79fb17c5ace98b1bc7f15bb90fa
Date: 2018-12-28T16:25:04+08:00
BaseTools/BinWrappers/PosixLike/GenerateCapsule
commit 7aef7b7cbf16f79fb17c5ace98b1bc7f15bb90fa
Date: 2018-12-28T16:25:04+08:00
BaseTools/BinWrappers/PosixLike/GenFds
commit 7aef7b7cbf16f79fb17c5ace98b1bc7f15bb90fa
Date: 2018-12-28T16:25:04+08:00
BaseTools/BinWrappers/PosixLike/GenFfs
commit 5e407648358d639ed19d228303527133e4c95c25
Date: 2016-01-20T05:12:02+00:00
BaseTools/BinWrappers/PosixLike/GenFv
commit 5e407648358d639ed19d228303527133e4c95c25
Date: 2016-01-20T05:12:02+00:00
BaseTools/BinWrappers/PosixLike/GenFw
commit 5e407648358d639ed19d228303527133e4c95c25
Date: 2016-01-20T05:12:02+00:00
BaseTools/BinWrappers/PosixLike/GenPatchPcdTable
commit 7aef7b7cbf16f79fb17c5ace98b1bc7f15bb90fa
Date: 2018-12-28T16:25:04+08:00
BaseTools/BinWrappers/PosixLike/GenSec
commit 5e407648358d639ed19d228303527133e4c95c25
Date: 2016-01-20T05:12:02+00:00
BaseTools/BinWrappers/PosixLike/LzmaCompress
commit 5e407648358d639ed19d228303527133e4c95c25
Date: 2016-01-20T05:12:02+00:00
BaseTools/BinWrappers/PosixLike/LzmaF86Compress
commit 2e351cbe8e190271b3716284fc1076551d005472
Date: 2019-04-03T16:03:11-07:00
BaseTools/BinWrappers/PosixLike/PatchPcdValue
commit 7aef7b7cbf16f79fb17c5ace98b1bc7f15bb90fa
Date: 2018-12-28T16:25:04+08:00
BaseTools/BinWrappers/PosixLike/Pkcs7Sign
commit 7aef7b7cbf16f79fb17c5ace98b1bc7f15bb90fa
Date: 2018-12-28T16:25:04+08:00
BaseTools/BinWrappers/PosixLike/Rsa2048Sha256GenerateKeys
commit 7aef7b7cbf16f79fb17c5ace98b1bc7f15bb90fa
Date: 2018-12-28T16:25:04+08:00
BaseTools/BinWrappers/PosixLike/Rsa2048Sha256Sign
commit 7aef7b7cbf16f79fb17c5ace98b1bc7f15bb90fa
Date: 2018-12-28T16:25:04+08:00
BaseTools/BinWrappers/PosixLike/Split
commit 5e407648358d639ed19d228303527133e4c95c25
Date: 2016-01-20T05:12:02+00:00
BaseTools/BinWrappers/PosixLike/TargetTool
commit 7aef7b7cbf16f79fb17c5ace98b1bc7f15bb90fa
Date: 2018-12-28T16:25:04+08:00
BaseTools/BinWrappers/PosixLike/TianoCompress
commit 5e407648358d639ed19d228303527133e4c95c25
Date: 2016-01-20T05:12:02+00:00
BaseTools/BinWrappers/PosixLike/Trim
commit 7aef7b7cbf16f79fb17c5ace98b1bc7f15bb90fa
Date: 2018-12-28T16:25:04+08:00
BaseTools/BinWrappers/PosixLike/UPT
commit 7aef7b7cbf16f79fb17c5ace98b1bc7f15bb90fa
Date: 2018-12-28T16:25:04+08:00
BaseTools/BinWrappers/PosixLike/VfrCompile
commit 5e407648358d639ed19d228303527133e4c95c25
Date: 2016-01-20T05:12:02+00:00
BaseTools/BinWrappers/PosixLike/VolInfo
commit 5e407648358d639ed19d228303527133e4c95c25
Date: 2016-01-20T05:12:02+00:00
-----Original Message-----
From: Feng, Bob C <bob.c.feng at intel.com>
Sent: 28 June 2020 08:34
To: devel at edk2.groups.io; Pierre Gondois <Pierre.Gondois at arm.com>
Cc: Sami Mujawar <Sami.Mujawar at arm.com>; Tomas Pilar <Tomas.Pilar at arm.com>; Gao, Liming <liming.gao at intel.com>; nd <nd at arm.com>
Subject: RE: [edk2-devel] [PATCH v3 0/4] Compile AML bytecode array into OBJ file
Hi Pierre,
I met a problem when I push your patch set.
If I change the CRLF to a unix format EOL, the patch can't pass PatchCheck.py.
If I don't change the CRLF, The build on Linux will fail.
So I can't make the patch set pass the CI.
Could you share me how did you do to make your PR 729 pass?
Thanks,
Bob
-----Original Message-----
From: devel at edk2.groups.io <devel at edk2.groups.io> On Behalf Of PierreGondois
Sent: Thursday, June 25, 2020 5:31 PM
To: devel at edk2.groups.io; Feng, Bob C <bob.c.feng at intel.com>
Cc: Sami Mujawar <Sami.Mujawar at arm.com>; Tomas Pilar <Tomas.Pilar at arm.com>; Gao, Liming <liming.gao at intel.com>; nd <nd at arm.com>
Subject: Re: [edk2-devel] [PATCH v3 0/4] Compile AML bytecode array into OBJ file
Hello Bob,
I believe the line endings of the BaseTools/BinWrappers/PosixLike/AmlToC script have been modified to CRLF when I sent the patch. I created a pull request from the linked github branch noted in the patches. It is available at https://github.com/PierreARM/edk2/commits/803_Compile_AML_bytecode_array_into_OBJ_file_v3 . The pull request is available here (to show the result of the CI tests) https://github.com/tianocore/edk2/pull/729 .
Do you want a v4 or is it possible to pull the patches from the github repository?
Sorry for the inconvenience.
Regards,
Pierre
-----Original Message-----
From: devel at edk2.groups.io <devel at edk2.groups.io> On Behalf Of Bob Feng via groups.io
Sent: 24 June 2020 16:16
To: devel at edk2.groups.io; Pierre Gondois <Pierre.Gondois at arm.com>
Cc: Sami Mujawar <Sami.Mujawar at arm.com>; Tomas Pilar <Tomas.Pilar at arm.com>; Gao, Liming <liming.gao at intel.com>; nd <nd at arm.com>
Subject: Re: [edk2-devel] [PATCH v3 0/4] Compile AML bytecode array into OBJ file
Hi Pierre,
There are some build failed in OpenCI. Would you please check it?
https://github.com/tianocore/edk2/pull/727
Thanks,
Bob
-----Original Message-----
From: devel at edk2.groups.io <devel at edk2.groups.io> On Behalf Of PierreGondois
Sent: Wednesday, June 24, 2020 5:09 PM
To: devel at edk2.groups.io
Cc: Pierre Gondois <Pierre.Gondois at arm.com>; sami.mujawar at arm.com; tomas.pilar at arm.com; Feng, Bob C <bob.c.feng at intel.com>; Gao, Liming <liming.gao at intel.com>; nd at arm.com
Subject: [edk2-devel] [PATCH v3 0/4] Compile AML bytecode array into OBJ file
Following the BZ at https://bugzilla.tianocore.org/show_bug.cgi?id=2425
This patch serie is a another way to solve the dependency of C files over ASL files. With this new method, the dependency is resolved at the linking stage.
The last method to solve this dependency was to add the possibility to modify INF files to depict such a dependency. This method was not accepted. The discussion is available at https://edk2.groups.io/g/devel/topic/72655342#56658
The last patch modifying the INF specification and INF parsing are available at:
https://edk2.groups.io/g/devel/topic/72655342#56658
https://edk2.groups.io/g/devel/topic/72656060#56662
Pierre Gondois (4):
BaseTools: Generate multiple rules when multiple output files
BaseTools: Rename AmlToHex script to AmlToC
BaseTools: Compile AML bytecode arrays into .obj file
BaseTools: Fix string concatenation
BaseTools/BinWrappers/PosixLike/{AmlToHex => AmlToC} | 28 +++----
BaseTools/BinWrappers/WindowsLike/{AmlToHex.bat => AmlToC.bat} | 0
BaseTools/Conf/build_rule.template | 15 +++-
BaseTools/Source/Python/{AmlToHex/AmlToHex.py => AmlToC/AmlToC.py} | 82 ++++++++------------
BaseTools/Source/Python/AutoGen/BuildEngine.py | 2 +-
BaseTools/Source/Python/AutoGen/GenMake.py | 6 ++
BaseTools/Source/Python/AutoGen/ModuleAutoGen.py | 38 +++++----
7 files changed, 89 insertions(+), 82 deletions(-) rename BaseTools/BinWrappers/PosixLike/{AmlToHex => AmlToC} (97%) rename BaseTools/BinWrappers/WindowsLike/{AmlToHex.bat => AmlToC.bat} (100%) rename BaseTools/Source/Python/{AmlToHex/AmlToHex.py => AmlToC/AmlToC.py} (52%)
--
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#61769): https://edk2.groups.io/g/devel/message/61769
Mute This Topic: https://groups.io/mt/75078123/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-
More information about the edk2-devel-archive
mailing list