]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
binman: bintool: bzip2: fix version function on non-Debian-based systems
authorQuentin Schulz <quentin.schulz@theobroma-systems.com>
Thu, 1 Sep 2022 15:51:43 +0000 (17:51 +0200)
committerSimon Glass <sjg@chromium.org>
Thu, 1 Sep 2022 17:36:36 +0000 (11:36 -0600)
Upstream bzip2 1.0.x actually is stuck when running bzip2 -V and
redirecting the output. This is fixed in Debian for about a decade
already in
https://git.launchpad.net/ubuntu/+source/bzip2/tree/debian/patches/20-legacy.patch?h=ubuntu/jammy
and in bzip2 1.1.x (no release yet, see
https://gitlab.com/bzip2/bzip2/-/commit/65179284ceddc43e6388bf4ed8c2d85cf16e1b2f
).

Fedora notably does not have such a patch.

Since bzip2 --help actually prints the version number too, let's use it
instead so that binman works fine on (hopefully) all distributions.

Fixes: 45aa2798008c ("binman: Add bzip2 bintool")
Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
tools/binman/btool/bzip2.py

index 9be87a621f2ea7e95863112b4c0f945a883ff410..c3897d63acb53db56d571452e8c588dd47192350 100644 (file)
@@ -27,4 +27,4 @@ class Bintoolbzip2(bintool.BintoolPacker):
         man bzip2
     """
     def __init__(self, name):
-        super().__init__(name, version_regex=r'bzip2.*Version ([0-9.]+)')
+        super().__init__(name, version_regex=r'bzip2.*Version ([0-9.]+)', version_args='--help')