diff mbox series

[v4,12/13] binman: Add zstd bintool

Message ID 20220816084210.14972-12-stefan.herbrechtsmeier-oss@weidmueller.com
State Changes Requested
Delegated to: Simon Glass
Headers show
Series [v4,01/13] binman: Skip elf tests if python elftools is not available | expand

Commit Message

Stefan Herbrechtsmeier Aug. 16, 2022, 8:42 a.m. UTC 
From: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>

Add zstd bintool to binman to support on-the-fly compression.

Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>

---

(no changes since v3)

Changes in v3:
- Rebase

Changes in v2:
- Added

 tools/binman/btool/zstd.py     | 30 ++++++++++++++++++++++++++++++
 tools/binman/comp_util.py      |  4 +++-
 tools/binman/etype/blob_dtb.py |  4 ++++
 tools/binman/ftest.py          |  3 ++-
 4 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 tools/binman/btool/zstd.py

Comments

Simon Glass Aug. 16, 2022, 11:48 a.m. UTC | #1 
On Tue, 16 Aug 2022 at 02:42, Stefan Herbrechtsmeier
<stefan.herbrechtsmeier-oss@weidmueller.com> wrote:
>
> From: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
>
> Add zstd bintool to binman to support on-the-fly compression.
>
> Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
>
> ---
>
> (no changes since v3)
>
> Changes in v3:
> - Rebase
>
> Changes in v2:
> - Added
>
>  tools/binman/btool/zstd.py     | 30 ++++++++++++++++++++++++++++++
>  tools/binman/comp_util.py      |  4 +++-
>  tools/binman/etype/blob_dtb.py |  4 ++++
>  tools/binman/ftest.py          |  3 ++-
>  4 files changed, 39 insertions(+), 2 deletions(-)
>  create mode 100644 tools/binman/btool/zstd.py

Reviewed-by: Simon Glass <sjg@chromium.org>
diff mbox series

Patch

diff --git a/tools/binman/btool/zstd.py b/tools/binman/btool/zstd.py
new file mode 100644
index 0000000000..299bd37126
--- /dev/null
+++ b/tools/binman/btool/zstd.py
@@ -0,0 +1,30 @@ 
+# SPDX-License-Identifier: GPL-2.0+
+# Copyright (C) 2022 Weidmüller Interface GmbH & Co. KG
+# Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
+#
+"""Bintool implementation for zstd
+
+zstd allows compression and decompression of files.
+
+Documentation is available via::
+
+   man zstd
+"""
+
+from binman import bintool
+
+# pylint: disable=C0103
+class Bintoolzstd(bintool.BintoolPacker):
+    """Compression/decompression using the zstd algorithm
+
+    This bintool supports running `zstd` to compress and decompress data, as
+    used by binman.
+
+    It is also possible to fetch the tool, which uses `apt` to install it.
+
+    Documentation is available via::
+
+        man zstd
+    """
+    def __init__(self, name):
+        super().__init__(name)
diff --git a/tools/binman/comp_util.py b/tools/binman/comp_util.py
index 8c0fe5078f..6b4ab646e0 100644
--- a/tools/binman/comp_util.py
+++ b/tools/binman/comp_util.py
@@ -13,6 +13,7 @@  This supports the following compression algorithm:
   lzma
   lzo
   xz
+  zstd
 
 Note that for lzma this uses an old version of the algorithm, not that
 provided by xz.
@@ -24,6 +25,7 @@  This requires the following tools:
   lzma_alone
   lzop
   xz
+  zstd
 
 It also requires an output directory to be previously set up, by calling
 PrepareOutputDir().
@@ -35,7 +37,7 @@  from binman import bintool
 from patman import tools
 
 # Supported compression algorithms
-ALGORITHMS = ['bzip2', 'gzip', 'lz4', 'lzma', 'lzo', 'xz']
+ALGORITHMS = ['bzip2', 'gzip', 'lz4', 'lzma', 'lzo', 'xz', 'zstd']
 
 bintools = {}
 
diff --git a/tools/binman/etype/blob_dtb.py b/tools/binman/etype/blob_dtb.py
index 4fd2ecda83..fab79e43cc 100644
--- a/tools/binman/etype/blob_dtb.py
+++ b/tools/binman/etype/blob_dtb.py
@@ -48,6 +48,10 @@  class Entry_blob_dtb(Entry_blob):
     def ProcessContents(self):
         """Re-read the DTB contents so that we get any calculated properties"""
         _, indata = state.GetFdtContents(self.GetFdtEtype())
+
+        if self.compress == 'zstd' and self.prepend != 'length':
+            self.Raise('The zstd compression requires a length header')
+
         data = self.CompressData(indata)
         if self.prepend == 'length':
             hdr = struct.pack('<I', len(data))
diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index bc17107735..a360ebeef5 100644
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -5272,7 +5272,8 @@  fdt         fdtmap                Extract the devicetree blob from the fdtmap
 
     def testCompUtilPadding(self):
         """Test padding of compression algorithms"""
-        for algo in comp_util.ALGORITHMS:
+        # Skip zstd because it doesn't support padding
+        for algo in [a for a in comp_util.ALGORITHMS if a != 'zstd']:
             self._checkCompUtil(algo)
             data = comp_util.compress(COMPRESS_DATA, algo)
             data = data + tools.get_bytes(0, 64)