[libvirt] [jenkins-ci PATCH] Add perl-generators package
Modern Fedora packaging requires the perl-generators package for RPM builds. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- guests/vars/mappings.yml | 4 ++++ guests/vars/projects/libvirt-perl.yml | 1 + guests/vars/projects/libvirt-tck.yml | 1 + 3 files changed, 6 insertions(+) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index af026e1..db26c8f 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -520,6 +520,10 @@ mappings: default: perl FreeBSD: perl5 + perl-generators: + default: + Fedora: perl-generators + perl-Archive-Tar: deb: perl pkg: perl5 diff --git a/guests/vars/projects/libvirt-perl.yml b/guests/vars/projects/libvirt-perl.yml index 2eb14f2..d5aa498 100644 --- a/guests/vars/projects/libvirt-perl.yml +++ b/guests/vars/projects/libvirt-perl.yml @@ -1,5 +1,6 @@ --- packages: + - perl-generators - perl-Archive-Tar - perl-CPAN-Changes - perl-Module-Build diff --git a/guests/vars/projects/libvirt-tck.yml b/guests/vars/projects/libvirt-tck.yml index dcccc0f..270e64b 100644 --- a/guests/vars/projects/libvirt-tck.yml +++ b/guests/vars/projects/libvirt-tck.yml @@ -1,5 +1,6 @@ --- packages: + - perl-generators - perl-Archive-Tar - perl-Config-Record - perl-Digest -- 2.17.0
On Fri, 2018-06-08 at 09:49 +0100, Daniel P. Berrangé wrote: [...]
+ perl-generators: + default: + Fedora: perl-generators
Sorting is off - this should be further down, after perl-accessors. Empty entries are only necessary when you have to remove a value that was added by a more generic entry; in this case, you can leave it out and only have the Fedora entry. [...]
packages: + - perl-generators - perl-Archive-Tar - perl-CPAN-Changes - perl-Module-Build
Sorting is again off. [...]
packages: + - perl-generators - perl-Archive-Tar - perl-Config-Record - perl-Digest
Here too. Regardless of the nits pointed out above, this commit will fix the build issue on Fedora but not on CentOS 7, where neither perl-generators nor perl-interpreter exist: you need to also tweak libvirt-perl's spec so that those packages are only required on Fedora. Since that needs to be fixed in a different repository, though, once you have addressed all of the above you can consider this patch Reviewed-by: Andrea Bolognani <abologna@redhat.com> -- Andrea Bolognani / Red Hat / Virtualization
On Fri, Jun 08, 2018 at 11:41:54AM +0200, Andrea Bolognani wrote:
On Fri, 2018-06-08 at 09:49 +0100, Daniel P. Berrangé wrote: [...]
+ perl-generators: + default: + Fedora: perl-generators
Sorting is off - this should be further down, after perl-accessors.
Empty entries are only necessary when you have to remove a value that was added by a more generic entry; in this case, you can leave it out and only have the Fedora entry.
[...]
packages: + - perl-generators - perl-Archive-Tar - perl-CPAN-Changes - perl-Module-Build
Sorting is again off.
[...]
packages: + - perl-generators - perl-Archive-Tar - perl-Config-Record - perl-Digest
Here too.
Regardless of the nits pointed out above, this commit will fix the build issue on Fedora but not on CentOS 7, where neither perl-generators nor perl-interpreter exist: you need to also tweak libvirt-perl's spec so that those packages are only required on Fedora.
I sent a patch for that yesterday.... https://www.redhat.com/archives/libvir-list/2018-June/msg00540.html
Since that needs to be fixed in a different repository, though, once you have addressed all of the above you can consider this patch
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
-- Andrea Bolognani / Red Hat / Virtualization
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 :|
On Fri, 2018-06-08 at 10:45 +0100, Daniel P. Berrangé wrote:
On Fri, Jun 08, 2018 at 11:41:54AM +0200, Andrea Bolognani wrote:
Regardless of the nits pointed out above, this commit will fix the build issue on Fedora but not on CentOS 7, where neither perl-generators nor perl-interpreter exist: you need to also tweak libvirt-perl's spec so that those packages are only required on Fedora.
I sent a patch for that yesterday....
https://www.redhat.com/archives/libvir-list/2018-June/msg00540.html
Must have missed it :) Looking at it now, in the interest of not having to tweak this again once "future RHEL" is releases I suggest rewriting the mapping as perl-generators: rpm: perl-generators CentOS6: CentOS7: I wonder if we should handle perl-interpreter explicitly as well? Perhaps it's okay to assume perl will either provide or drag in perl-interpreter, at least for the time being. -- Andrea Bolognani / Red Hat / Virtualization
On Fri, Jun 08, 2018 at 11:57:43AM +0200, Andrea Bolognani wrote:
On Fri, 2018-06-08 at 10:45 +0100, Daniel P. Berrangé wrote:
On Fri, Jun 08, 2018 at 11:41:54AM +0200, Andrea Bolognani wrote:
Regardless of the nits pointed out above, this commit will fix the build issue on Fedora but not on CentOS 7, where neither perl-generators nor perl-interpreter exist: you need to also tweak libvirt-perl's spec so that those packages are only required on Fedora.
I sent a patch for that yesterday....
https://www.redhat.com/archives/libvir-list/2018-June/msg00540.html
Must have missed it :)
Looking at it now, in the interest of not having to tweak this again once "future RHEL" is releases I suggest rewriting the mapping as
perl-generators: rpm: perl-generators CentOS6: CentOS7:
Yeah looks good.
I wonder if we should handle perl-interpreter explicitly as well? Perhaps it's okay to assume perl will either provide or drag in perl-interpreter, at least for the time being.
Yeah, 'perl' (and a million other things) pull in perl-interpretor so I didn't feel a need to add it. 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 :|
participants (2)
-
Andrea Bolognani -
Daniel P. Berrangé