diff options
| author | Kinney, Michael D </o=Intel/ou=Americas01/cn=Workers/cn=Kinney, Michael D> | 2018-08-04 04:47:33 +0800 |
|---|---|---|
| committer | Yonghong Zhu <yonghong.zhu@intel.com> | 2018-08-06 10:48:35 +0800 |
| commit | cd3a42640acdb4f5ac14ac19f22ede002124920c (patch) | |
| tree | 5d1614758564bcef8e9723a53b6b6ce49390e74e | |
| parent | 81038d50c9c9bbe5756d6ba172d692d0c7b58a62 (diff) | |
| download | edk2-cd3a42640acdb4f5ac14ac19f22ede002124920c.tar.gz edk2-cd3a42640acdb4f5ac14ac19f22ede002124920c.tar.bz2 edk2-cd3a42640acdb4f5ac14ac19f22ede002124920c.zip | |
BaseTools/BinToPcd: Open output file as text file
https://bugzilla.tianocore.org/show_bug.cgi?id=1069
Undo changes from following commit:
https://github.com/tianocore/edk2/commit/83964ebc5e74549d6efc7134af19150a0b2079aa
Change the open mode for the output file from 'wb' to 'w' so the
output file is written as a text file and not a binary file.
This resolves the issue where the text file was not writable from
Python 3.x and also removes b'' from output file when the string
was encoded as a bytearray.
Cc: YanYan Sun <yanyan.sun@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Tested-by:YanYan Sun <yanyan.sun@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
| -rw-r--r-- | BaseTools/Scripts/BinToPcd.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/BaseTools/Scripts/BinToPcd.py b/BaseTools/Scripts/BinToPcd.py index 1495a36933..316cc6117f 100644 --- a/BaseTools/Scripts/BinToPcd.py +++ b/BaseTools/Scripts/BinToPcd.py @@ -70,8 +70,7 @@ if __name__ == '__main__': #
# Return a PCD value of the form '{0x01, 0x02, ...}' along with the PCD length in bytes
#
- PcdValue = '{' + ', '.join (['0x{Byte:02X}'.format (Byte = Item) for Item in Buffer]) + '}'
- return PcdValue.encode (), len (Buffer)
+ return '{' + (', '.join (['0x{Byte:02X}'.format (Byte = Item) for Item in Buffer])) + '}', len (Buffer)
#
# Create command line argument parser object
@@ -81,7 +80,7 @@ if __name__ == '__main__': conflict_handler = 'resolve')
parser.add_argument ("-i", "--input", dest = 'InputFile', type = argparse.FileType ('rb'), action='append', required = True,
help = "Input binary filename. Multiple input files are combined into a single PCD.")
- parser.add_argument ("-o", "--output", dest = 'OutputFile', type = argparse.FileType ('wb'),
+ parser.add_argument ("-o", "--output", dest = 'OutputFile', type = argparse.FileType ('w'),
help = "Output filename for PCD value or PCD statement")
parser.add_argument ("-p", "--pcd", dest = 'PcdName', type = ValidatePcdName,
help = "Name of the PCD in the form <PcdTokenSpaceGuidCName>.<PcdCName>")
|