From: Simon Glass <sjg@chromium.org>
Date: Mon, 8 Jul 2019 19:18:44 +0000 (-0600)
Subject: binman: Use tools compression function for blob handling
X-Git-Tag: v2019.10-rc1~14^2~53
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c444b1a54f139a8e3fa1fc9d60300b73573d455f;p=oweals%2Fu-boot.git

binman: Use tools compression function for blob handling

Avoid duplicate code here by using the new compression function in the
tools module.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/tools/binman/etype/blob.py b/tools/binman/etype/blob.py
index f56a1f8768..a91e784700 100644
--- a/tools/binman/etype/blob.py
+++ b/tools/binman/etype/blob.py
@@ -49,18 +49,10 @@ class Entry_blob(Entry):
         # new Entry method which can read in chunks. Then we could copy
         # the data in chunks and avoid reading it all at once. For now
         # this seems like an unnecessary complication.
-        data = tools.ReadFile(self._pathname)
-        if self._compress == 'lz4':
-            self._uncompressed_size = len(data)
-            '''
-            import lz4  # Import this only if needed (python-lz4 dependency)
-
-            try:
-                data = lz4.frame.compress(data)
-            except AttributeError:
-                data = lz4.compress(data)
-            '''
-            data = tools.Run('lz4', '-c', self._pathname, binary=True)
+        indata = tools.ReadFile(self._pathname)
+        if self._compress != 'none':
+            self._uncompressed_size = len(indata)
+        data = tools.Compress(indata, self._compress)
         self.SetContents(data)
         return True