diff options
| author | Quentin Schulz <quentin.schulz@theobroma-systems.com> | 2022-09-01 17:51:43 +0200 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2022-09-01 11:36:36 -0600 |
| commit | 7ac6842316ad1d412a49f88d8668923b40b09b5f (patch) | |
| tree | 010d25690f83dd2107228d51b4a2c784f436babb | |
| parent | 9c9678632765678e607a88f0ebe7f5260ad6fdaa (diff) | |
| download | u-boot-7ac6842316ad1d412a49f88d8668923b40b09b5f.zip u-boot-7ac6842316ad1d412a49f88d8668923b40b09b5f.tar.gz u-boot-7ac6842316ad1d412a49f88d8668923b40b09b5f.tar.bz2 | |
binman: bintool: bzip2: fix version function on non-Debian-based systems
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>
| -rw-r--r-- | tools/binman/btool/bzip2.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/binman/btool/bzip2.py b/tools/binman/btool/bzip2.py index 9be87a6..c3897d6 100644 --- a/tools/binman/btool/bzip2.py +++ b/tools/binman/btool/bzip2.py @@ -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') |