binman: Add lzop bintool

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

Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/tools/binman/btool/lzop.py b/tools/binman/btool/lzop.py
new file mode 100644 (file)
index 0000000..f6903b4
--- /dev/null
+++ b/tools/binman/btool/lzop.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 lzop
+
+lzop allows compression and decompression of files.
+
+Documentation is available via::
+
+   man lzop
+"""
+
+from binman import bintool
+
+# pylint: disable=C0103
+class Bintoollzop(bintool.BintoolPacker):
+    """Compression/decompression using the lzop algorithm
+
+    This bintool supports running `lzop` 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 lzop
+    """
+    def __init__(self, name):
+        super().__init__(name, 'lzo', compress_args=[])

diff --git a/tools/binman/entry.py b/tools/binman/entry.py
index 84a303665d46f9dc42352463229d8e5f72a8c068..ea2190b23a39e598f76c1232fe90f4aed3de7250 100644 (file)
--- a/tools/binman/entry.py
+++ b/tools/binman/entry.py
@@ -1191,10 +1191,10 @@ features to produce new behaviours.
         """
         algo = self.compress
         if algo != 'none':
-            algos = ['bzip2', 'gzip', 'lz4', 'lzma']
+            algos = ['bzip2', 'gzip', 'lz4', 'lzma', 'lzo']
             if algo not in algos:
                 raise ValueError("Unknown algorithm '%s'" % algo)
-            names = {'lzma': 'lzma_alone'}
+            names = {'lzma': 'lzma_alone', 'lzo': 'lzop'}
             name = names.get(self.compress, self.compress)
             self.comp_bintool = self.AddBintool(btools, name)
 

diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index 5275855baf0c80317dfd1f2e8a1029ca29dd0139..4ff871af0b6c8f203971feec10d4328a973e9cb7 100644 (file)
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -107,7 +107,7 @@ BASE_DTB_PROPS = ['offset', 'size', 'image-pos']
 REPACK_DTB_PROPS = ['orig-offset', 'orig-size']
 
 # Supported compression bintools
-COMP_BINTOOLS = ['bzip2', 'gzip', 'lz4', 'lzma_alone']
+COMP_BINTOOLS = ['bzip2', 'gzip', 'lz4', 'lzma_alone', 'lzop']
 
 class TestFunctional(unittest.TestCase):
     """Functional tests for binman