Message ID | 20220831173936.150114-7-foss+uboot@0leil.net |
---|---|
State | Superseded |
Delegated to: | Simon Glass |
Headers | show |
Series | [v2,1/7] binman: bintool: move version check implementation into bintool class | expand |
On Wed, 31 Aug 2022 at 11:40, Quentin Schulz <foss+uboot@0leil.net> wrote: > > 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> > --- > > 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(-) Reviewed-by: Simon Glass <sjg@chromium.org> version_args again Also something in this series breaks code coverage, I think in mkimage.py - so can you take a look at that? You may just need to delete code, or update the tests, not sure. > > diff --git a/tools/binman/btool/bzip2.py b/tools/binman/btool/bzip2.py > index 9be87a621f..078f637dda 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_parameters='--help') > -- > 2.37.2 > Regards, Siumon
diff --git a/tools/binman/btool/bzip2.py b/tools/binman/btool/bzip2.py index 9be87a621f..078f637dda 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_parameters='--help')