diff options
author | Simon Glass <sjg@chromium.org> | 2021-07-06 19:36:36 +0300 |
---|---|---|
committer | Simon Glass <sjg@chromium.org> | 2021-07-21 19:27:35 +0300 |
commit | 650ead1a4aac3010a029526d639682096c1d0469 (patch) | |
tree | 20995aa4aa2332436e7bce0fa4e1a4d2353b7f26 | |
parent | 72fa1ad8d9fe58153ca72e3886b8d846299e8fff (diff) | |
download | u-boot-650ead1a4aac3010a029526d639682096c1d0469.tar.xz |
binman: Put compressed data into separate files
At present compression uses the same temporary file for all invocations.
With multithreading this causes the data to become corrupted. Use a
different filename each time.
Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r-- | tools/patman/tools.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tools/patman/tools.py b/tools/patman/tools.py index ec95a543bd..877e37cd8d 100644 --- a/tools/patman/tools.py +++ b/tools/patman/tools.py @@ -466,6 +466,9 @@ def Compress(indata, algo, with_header=True): This requires 'lz4' and 'lzma_alone' tools. It also requires an output directory to be previously set up, by calling PrepareOutputDir(). + Care is taken to use unique temporary files so that this function can be + called from multiple threads. + Args: indata: Input data to compress algo: Algorithm to use ('none', 'gzip', 'lz4' or 'lzma') @@ -475,14 +478,16 @@ def Compress(indata, algo, with_header=True): """ if algo == 'none': return indata - fname = GetOutputFilename('%s.comp.tmp' % algo) + fname = tempfile.NamedTemporaryFile(prefix='%s.comp.tmp' % algo, + dir=outdir).name WriteFile(fname, indata) if algo == 'lz4': data = Run('lz4', '--no-frame-crc', '-B4', '-5', '-c', fname, binary=True) # cbfstool uses a very old version of lzma elif algo == 'lzma': - outfname = GetOutputFilename('%s.comp.otmp' % algo) + outfname = tempfile.NamedTemporaryFile(prefix='%s.comp.otmp' % algo, + dir=outdir).name Run('lzma_alone', 'e', fname, outfname, '-lc1', '-lp0', '-pb0', '-d8') data = ReadFile(outfname) elif algo == 'gzip': |