aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorQuentin Schulz2022-09-01 17:51:38 +0200
committerSimon Glass2022-09-01 11:36:36 -0600
commitf17219ad42b47921864bef25d9e058959ef87265 (patch)
treef9101eab67f5e4b99fb993b61c2effca0f896802 /tools
parent723a63eeec3ee22d63006dcae593d395698fa55c (diff)
binman: btool: lz4: use Bintool.version
Bintool.version already contains everything required to get the version out of lz4 binary so let's not override it with its own implementation. Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools')
-rw-r--r--tools/binman/btool/lz4.py14
1 files changed, 1 insertions, 13 deletions
diff --git a/tools/binman/btool/lz4.py b/tools/binman/btool/lz4.py
index f09c5c8904b..dc9e37921a6 100644
--- a/tools/binman/btool/lz4.py
+++ b/tools/binman/btool/lz4.py
@@ -76,7 +76,7 @@ class Bintoollz4(bintool.Bintool):
man lz4
"""
def __init__(self, name):
- super().__init__(name, 'lz4 compression')
+ super().__init__(name, 'lz4 compression', r'.* (v[0-9.]*),.*')
def compress(self, indata):
"""Compress data with lz4
@@ -126,15 +126,3 @@ class Bintoollz4(bintool.Bintool):
if method != bintool.FETCH_BIN:
return None
return self.apt_install('lz4')
-
- def version(self):
- """Version handler
-
- Returns:
- str: Version number of lz4
- """
- out = self.run_cmd('-V').strip()
- if not out:
- return super().version()
- m_version = re.match(r'.* (v[0-9.]*),.*', out)
- return m_version.group(1) if m_version else out