From: Quentin Schulz <foss+uboot@0leil.net>
Cc: sjg@chromium.org, alpernebiyasak@gmail.com,
stefan.herbrechtsmeier@weidmueller.com, u-boot@lists.denx.de,
Quentin Schulz <quentin.schulz@theobroma-systems.com>
Subject: [PATCH v3 7/7] binman: bintool: bzip2: fix version function on non-Debian-based systems
Date: Thu, 1 Sep 2022 17:51:43 +0200 [thread overview]
Message-ID: <20220901155143.1868735-7-foss+uboot@0leil.net> (raw)
In-Reply-To: <20220901155143.1868735-1-foss+uboot@0leil.net>
From: Quentin Schulz <quentin.schulz@theobroma-systems.com>
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>
---
v3:
- added Rb,
- renamed version_parameters into version_args,
v2:
- use version_parameters from Bintoolpacker class instead of overriding
version method,
tools/binman/btool/bzip2.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/binman/btool/bzip2.py b/tools/binman/btool/bzip2.py
index 9be87a621f..c3897d63ac 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')
--
2.37.2
next prev parent reply other threads:[~2022-09-01 15:53 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-01 15:51 [PATCH v3 1/7] binman: bintool: move version check implementation into bintool class Quentin Schulz
2022-09-01 15:51 ` [PATCH v3 2/7] binman: btool: lz4: use Bintool.version Quentin Schulz
2022-09-01 15:51 ` [PATCH v3 3/7] binman: btool: mkimage: " Quentin Schulz
2022-09-01 15:51 ` [PATCH v3 4/7] binman: bintool: parametrize args to pass to binary for returning version Quentin Schulz
2022-09-01 18:44 ` Simon Glass
2022-09-07 12:30 ` Simon Glass
2022-09-01 15:51 ` [PATCH v3 5/7] binman: btool: fiptool: use Bintool.version Quentin Schulz
2022-09-01 15:51 ` [PATCH v3 6/7] binman: btool: futility: " Quentin Schulz
2022-09-01 15:51 ` Quentin Schulz [this message]
2022-09-07 12:29 ` [PATCH v3 7/7] binman: bintool: bzip2: fix version function on non-Debian-based systems Simon Glass
2022-09-07 12:29 ` [PATCH v3 6/7] binman: btool: futility: use Bintool.version Simon Glass
2022-09-07 12:30 ` [PATCH v3 5/7] binman: btool: fiptool: " Simon Glass
2022-09-07 12:30 ` [PATCH v3 3/7] binman: btool: mkimage: " Simon Glass
2022-09-07 12:30 ` [PATCH v3 2/7] binman: btool: lz4: " Simon Glass
2022-09-07 12:30 ` [PATCH v3 1/7] binman: bintool: move version check implementation into bintool class Simon Glass
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220901155143.1868735-7-foss+uboot@0leil.net \
--to=foss+uboot@0leil.net \
--cc=alpernebiyasak@gmail.com \
--cc=quentin.schulz@theobroma-systems.com \
--cc=sjg@chromium.org \
--cc=stefan.herbrechtsmeier@weidmueller.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.