[libvirt] [tck PATCH 03/12] rpm: add some missing dependencies

Daniel P. Berrangé posted 12 patches 6 years, 11 months ago
There is a newer version of this series
[libvirt] [tck PATCH 03/12] rpm: add some missing dependencies
Posted by Daniel P. Berrangé 6 years, 11 months ago
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 perl-Sys-Virt-TCK.spec.PL | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/perl-Sys-Virt-TCK.spec.PL b/perl-Sys-Virt-TCK.spec.PL
index 39cc72f..c92fa34 100644
--- a/perl-Sys-Virt-TCK.spec.PL
+++ b/perl-Sys-Virt-TCK.spec.PL
@@ -35,8 +35,12 @@ Group: Development/Tools
 Source: http://libvirt.org/sources/tck/%{appname}-v%{version}.tar.gz
 Url: http://libvirt.org/
 BuildRoot: %{_tmppath}/%{appname}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: perl >= %{perl_version}
-Requires: libvirt >= 0.6.2
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires: libvirt >= 4.4.0
+%if 0%{?fedora} || 0%{?rhel} > 7
+BuildRequires: perl-interpreter
+BuildRequires: perl-generators
+%endif
 BuildRequires: perl(accessors)
 BuildRequires: perl(App::Prove)
 BuildRequires: perl(Config::Record)
@@ -57,9 +61,12 @@ BuildRequires: perl(TAP::Harness::Archive)
 BuildRequires: perl(Test::Builder)
 BuildRequires: perl(Test::More)
 BuildRequires: perl(Sub::Uplevel)
-BuildRequires: perl(Sys::Virt) >= 0.2.0
+BuildRequires: perl(Sys::Virt) >= 0.2.1
 BuildRequires: perl(XML::Twig)
 BuildRequires: perl(XML::Writer)
+BuildRequires: perl(XML::XPath)
+BuildRequires: perl(Test::Pod)
+BuildRequires: perl(Test::Pod::Coverage)
 # RPM autoprovides misses these 3
 Requires: perl(Test::Exception)
 Requires: perl(TAP::Formatter::HTML)
@@ -69,6 +76,8 @@ Requires: perl(Net::OpenSSH)
 Requires: perl(IO::Pty)
 Requires: libguestfs-tools
 Requires: /usr/bin/mkisofs
+# Want to force this minimal version, so don't rely on RPM autoprov
+Requires: perl(Sys::Virt) >= 0.2.1
 BuildArchitectures: noarch
 
 %description
-- 
2.17.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [tck PATCH 03/12] rpm: add some missing dependencies
Posted by Laine Stump 6 years, 11 months ago
On 06/08/2018 09:45 AM, Daniel P. Berrangé wrote:
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>  perl-Sys-Virt-TCK.spec.PL | 15 ++++++++++++---
>  1 file changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/perl-Sys-Virt-TCK.spec.PL b/perl-Sys-Virt-TCK.spec.PL
> index 39cc72f..c92fa34 100644
> --- a/perl-Sys-Virt-TCK.spec.PL
> +++ b/perl-Sys-Virt-TCK.spec.PL
> @@ -35,8 +35,12 @@ Group: Development/Tools
>  Source: http://libvirt.org/sources/tck/%{appname}-v%{version}.tar.gz
>  Url: http://libvirt.org/
>  BuildRoot: %{_tmppath}/%{appname}-%{version}-%{release}-root-%(%{__id_u} -n)
> -Requires: perl >= %{perl_version}
> -Requires: libvirt >= 0.6.2
> +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
> +Requires: libvirt >= 4.4.0

Are you sure it requires such a high libvirt version? This will make it
more cumbersome for downstream maintainers to test their builds of older
libvirt versions. Of course if there really is stuff that reliably fails
with older libvirt versions, then they would need to make a downstream
version of the tck that disables the failing tests anyway, but this
makes that mandatory from the get-go.

Still something I can live with though.

Reviewed-by: Laine Stump <laine@laine.org>



> +%if 0%{?fedora} || 0%{?rhel} > 7
> +BuildRequires: perl-interpreter
> +BuildRequires: perl-generators
> +%endif
>  BuildRequires: perl(accessors)
>  BuildRequires: perl(App::Prove)
>  BuildRequires: perl(Config::Record)
> @@ -57,9 +61,12 @@ BuildRequires: perl(TAP::Harness::Archive)
>  BuildRequires: perl(Test::Builder)
>  BuildRequires: perl(Test::More)
>  BuildRequires: perl(Sub::Uplevel)
> -BuildRequires: perl(Sys::Virt) >= 0.2.0
> +BuildRequires: perl(Sys::Virt) >= 0.2.1

What was this you were saying on IRC about 0.x version numbers? :-)

>  BuildRequires: perl(XML::Twig)
>  BuildRequires: perl(XML::Writer)
> +BuildRequires: perl(XML::XPath)
> +BuildRequires: perl(Test::Pod)
> +BuildRequires: perl(Test::Pod::Coverage)
>  # RPM autoprovides misses these 3
>  Requires: perl(Test::Exception)
>  Requires: perl(TAP::Formatter::HTML)
> @@ -69,6 +76,8 @@ Requires: perl(Net::OpenSSH)
>  Requires: perl(IO::Pty)
>  Requires: libguestfs-tools
>  Requires: /usr/bin/mkisofs
> +# Want to force this minimal version, so don't rely on RPM autoprov
> +Requires: perl(Sys::Virt) >= 0.2.1
>  BuildArchitectures: noarch
>  
>  %description


--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [tck PATCH 03/12] rpm: add some missing dependencies
Posted by Daniel P. Berrangé 6 years, 11 months ago
On Fri, Jun 08, 2018 at 11:07:13AM -0400, Laine Stump wrote:
> On 06/08/2018 09:45 AM, Daniel P. Berrangé wrote:
> > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> > ---
> >  perl-Sys-Virt-TCK.spec.PL | 15 ++++++++++++---
> >  1 file changed, 12 insertions(+), 3 deletions(-)
> >
> > diff --git a/perl-Sys-Virt-TCK.spec.PL b/perl-Sys-Virt-TCK.spec.PL
> > index 39cc72f..c92fa34 100644
> > --- a/perl-Sys-Virt-TCK.spec.PL
> > +++ b/perl-Sys-Virt-TCK.spec.PL
> > @@ -35,8 +35,12 @@ Group: Development/Tools
> >  Source: http://libvirt.org/sources/tck/%{appname}-v%{version}.tar.gz
> >  Url: http://libvirt.org/
> >  BuildRoot: %{_tmppath}/%{appname}-%{version}-%{release}-root-%(%{__id_u} -n)
> > -Requires: perl >= %{perl_version}
> > -Requires: libvirt >= 0.6.2
> > +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
> > +Requires: libvirt >= 4.4.0
> 
> Are you sure it requires such a high libvirt version? This will make it
> more cumbersome for downstream maintainers to test their builds of older
> libvirt versions. Of course if there really is stuff that reliably fails
> with older libvirt versions, then they would need to make a downstream
> version of the tck that disables the failing tests anyway, but this
> makes that mandatory from the get-go.

To be honest I didn't check how broken older libvirt's are, but given
the fun with had with nwfilter, I suspect most are broken to some
degree or other. In fact even 4.4.0 is broken with nwfilter as my
two patches missed the release.

> Still something I can live with though.
> 
> Reviewed-by: Laine Stump <laine@laine.org>

> > @@ -57,9 +61,12 @@ BuildRequires: perl(TAP::Harness::Archive)
> >  BuildRequires: perl(Test::Builder)
> >  BuildRequires: perl(Test::More)
> >  BuildRequires: perl(Sub::Uplevel)
> > -BuildRequires: perl(Sys::Virt) >= 0.2.0
> > +BuildRequires: perl(Sys::Virt) >= 0.2.1
> 
> What was this you were saying on IRC about 0.x version numbers? :-)

This was just syned from further down.

I do still need to figure out just which APIs from newer libvirt
we require.

> 
> >  BuildRequires: perl(XML::Twig)
> >  BuildRequires: perl(XML::Writer)
> > +BuildRequires: perl(XML::XPath)
> > +BuildRequires: perl(Test::Pod)
> > +BuildRequires: perl(Test::Pod::Coverage)
> >  # RPM autoprovides misses these 3
> >  Requires: perl(Test::Exception)
> >  Requires: perl(TAP::Formatter::HTML)
> > @@ -69,6 +76,8 @@ Requires: perl(Net::OpenSSH)
> >  Requires: perl(IO::Pty)
> >  Requires: libguestfs-tools
> >  Requires: /usr/bin/mkisofs
> > +# Want to force this minimal version, so don't rely on RPM autoprov
> > +Requires: perl(Sys::Virt) >= 0.2.1
> >  BuildArchitectures: noarch
> >  
> >  %description
> 
> 

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [tck PATCH 03/12] rpm: add some missing dependencies
Posted by Laine Stump 6 years, 11 months ago
On 06/08/2018 11:10 AM, Daniel P. Berrangé wrote:
> I do still need to figure out just which APIs from newer libvirt
> we require.

I had added a function that uses the (relatively new I guess) API to get
guest IP addresses, but wrote the code so that it would fall back to the
older method of parsing the dnsmasq lease files if the API wasn't
available...

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list