[libvirt] [jenkins-ci PATCH 0/3] guests: Update for Module::Build
To be applied along with https://www.redhat.com/archives/libvir-list/2018-May/msg01121.html once libvirt-perl switches to Module::Build. Andrea Bolognani (3): guests: Install Module::Build for libvirt-perl guests: Add Archive::Tar dependency for Perl projects guests: Blacklist perl-ExtUtils-MakeMaker guests/vars/mappings.yml | 6 +++++- guests/vars/projects/blacklist.yml | 1 + guests/vars/projects/libvirt-perl.yml | 3 ++- guests/vars/projects/libvirt-tck.yml | 1 + 4 files changed, 9 insertions(+), 2 deletions(-) -- 2.17.0
The libvirt-perl project switched from ExtUtils::MakeMaker to Module::Build, so we need to change packages accordingly. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- guests/vars/projects/libvirt-perl.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guests/vars/projects/libvirt-perl.yml b/guests/vars/projects/libvirt-perl.yml index 1118406..a19e232 100644 --- a/guests/vars/projects/libvirt-perl.yml +++ b/guests/vars/projects/libvirt-perl.yml @@ -1,7 +1,7 @@ --- packages: - perl-CPAN-Changes - - perl-ExtUtils-MakeMaker + - perl-Module-Build - perl-Test-Pod - perl-Test-Pod-Coverage - perl-Time-HiRes -- 2.17.0
On Tue, May 15, 2018 at 08:27:34PM +0200, Andrea Bolognani wrote:
The libvirt-perl project switched from ExtUtils::MakeMaker to Module::Build, so we need to change packages accordingly.
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- guests/vars/projects/libvirt-perl.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/guests/vars/projects/libvirt-perl.yml b/guests/vars/projects/libvirt-perl.yml index 1118406..a19e232 100644 --- a/guests/vars/projects/libvirt-perl.yml +++ b/guests/vars/projects/libvirt-perl.yml @@ -1,7 +1,7 @@ --- packages: - perl-CPAN-Changes - - perl-ExtUtils-MakeMaker + - perl-Module-Build - perl-Test-Pod - perl-Test-Pod-Coverage - perl-Time-HiRes
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> 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 :|
Module::Build requires Archive::Tar in order to create distribution archives, but on some operating systems there is no explicit dependency dragging it the latter when installing the former, so we need to handle it ourselves. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- guests/vars/mappings.yml | 5 +++++ guests/vars/projects/libvirt-perl.yml | 1 + guests/vars/projects/libvirt-tck.yml | 1 + 3 files changed, 7 insertions(+) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index cfba51c..f809e24 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -514,6 +514,11 @@ mappings: default: perl FreeBSD: perl5 + perl-Archive-Tar: + deb: perl + pkg: perl5 + rpm: perl-Archive-Tar + perl-CPAN-Changes: deb: libcpan-changes-perl pkg: p5-CPAN-Changes diff --git a/guests/vars/projects/libvirt-perl.yml b/guests/vars/projects/libvirt-perl.yml index a19e232..2eb14f2 100644 --- a/guests/vars/projects/libvirt-perl.yml +++ b/guests/vars/projects/libvirt-perl.yml @@ -1,5 +1,6 @@ --- packages: + - perl-Archive-Tar - perl-CPAN-Changes - perl-Module-Build - perl-Test-Pod diff --git a/guests/vars/projects/libvirt-tck.yml b/guests/vars/projects/libvirt-tck.yml index 8d29c1c..dcccc0f 100644 --- a/guests/vars/projects/libvirt-tck.yml +++ b/guests/vars/projects/libvirt-tck.yml @@ -1,5 +1,6 @@ --- packages: + - perl-Archive-Tar - perl-Config-Record - perl-Digest - perl-Digest-MD5 -- 2.17.0
On Tue, May 15, 2018 at 08:27:35PM +0200, Andrea Bolognani wrote:
Module::Build requires Archive::Tar in order to create distribution archives, but on some operating systems there is no explicit dependency dragging it the latter when installing the former, so we need to handle it ourselves.
Hmm, any idea why we didn't see a failure already with libvirt-tck then ?
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- guests/vars/mappings.yml | 5 +++++ guests/vars/projects/libvirt-perl.yml | 1 + guests/vars/projects/libvirt-tck.yml | 1 + 3 files changed, 7 insertions(+)
diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index cfba51c..f809e24 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -514,6 +514,11 @@ mappings: default: perl FreeBSD: perl5
+ perl-Archive-Tar: + deb: perl + pkg: perl5 + rpm: perl-Archive-Tar + perl-CPAN-Changes: deb: libcpan-changes-perl pkg: p5-CPAN-Changes diff --git a/guests/vars/projects/libvirt-perl.yml b/guests/vars/projects/libvirt-perl.yml index a19e232..2eb14f2 100644 --- a/guests/vars/projects/libvirt-perl.yml +++ b/guests/vars/projects/libvirt-perl.yml @@ -1,5 +1,6 @@ --- packages: + - perl-Archive-Tar - perl-CPAN-Changes - perl-Module-Build - perl-Test-Pod diff --git a/guests/vars/projects/libvirt-tck.yml b/guests/vars/projects/libvirt-tck.yml index 8d29c1c..dcccc0f 100644 --- a/guests/vars/projects/libvirt-tck.yml +++ b/guests/vars/projects/libvirt-tck.yml @@ -1,5 +1,6 @@ --- packages: + - perl-Archive-Tar - perl-Config-Record - perl-Digest - perl-Digest-MD5
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> 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 Wed, 2018-05-16 at 13:39 +0100, Daniel P. Berrangé wrote:
On Tue, May 15, 2018 at 08:27:35PM +0200, Andrea Bolognani wrote:
Module::Build requires Archive::Tar in order to create distribution archives, but on some operating systems there is no explicit dependency dragging it the latter when installing the former, so we need to handle it ourselves.
Hmm, any idea why we didn't see a failure already with libvirt-tck then ?
I thought it was because we were not building libvirt-tck on the machines where libvirt-perl RPM build was failing, but it looks like that's not the case, so it might have been a red herring. I'll take another look. -- Andrea Bolognani / Red Hat / Virtualization
On Wed, 2018-05-16 at 15:56 +0200, Andrea Bolognani wrote:
On Wed, 2018-05-16 at 13:39 +0100, Daniel P. Berrangé wrote:
On Tue, May 15, 2018 at 08:27:35PM +0200, Andrea Bolognani wrote:
Module::Build requires Archive::Tar in order to create distribution archives, but on some operating systems there is no explicit dependency dragging it the latter when installing the former, so we need to handle it ourselves.
Hmm, any idea why we didn't see a failure already with libvirt-tck then ?
I thought it was because we were not building libvirt-tck on the machines where libvirt-perl RPM build was failing, but it looks like that's not the case, so it might have been a red herring.
I'll take another look.
Okay, the thing is that on Fedora Module::Build drags in Archive::Tar but on CentOS it doesn't; the reason we didn't see any breakages is that we don't build libvirt-tck on CentOS. tl;dr this patch is needed; the other one (Package::Constants) can be safely skipped. -- Andrea Bolognani / Red Hat / Virtualization
We no longer need it, so blacklist it to make sure existing guests, where it was installed in the past, are cleaned up. We'll be able to drop it from the blacklist, along with the corresponding mapping, after a reasonable amount of time. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- guests/vars/mappings.yml | 1 - guests/vars/projects/blacklist.yml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index f809e24..211440a 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -544,7 +544,6 @@ mappings: Ubuntu14: perl-ExtUtils-MakeMaker: - deb: perl-modules pkg: p5-ExtUtils-MakeMaker rpm: perl-ExtUtils-MakeMaker diff --git a/guests/vars/projects/blacklist.yml b/guests/vars/projects/blacklist.yml index e5f369c..ab76e0e 100644 --- a/guests/vars/projects/blacklist.yml +++ b/guests/vars/projects/blacklist.yml @@ -1,3 +1,4 @@ --- packages: - nano + - perl-ExtUtils-MakeMaker -- 2.17.0
On Tue, May 15, 2018 at 08:27:36PM +0200, Andrea Bolognani wrote:
We no longer need it, so blacklist it to make sure existing guests, where it was installed in the past, are cleaned up.
We'll be able to drop it from the blacklist, along with the corresponding mapping, after a reasonable amount of time.
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- guests/vars/mappings.yml | 1 - guests/vars/projects/blacklist.yml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> 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 Wed, 2018-05-16 at 13:40 +0100, Daniel P. Berrangé wrote:
On Tue, May 15, 2018 at 08:27:36PM +0200, Andrea Bolognani wrote:
We no longer need it, so blacklist it to make sure existing guests, where it was installed in the past, are cleaned up.
We'll be able to drop it from the blacklist, along with the corresponding mapping, after a reasonable amount of time.
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- guests/vars/mappings.yml | 1 - guests/vars/projects/blacklist.yml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Uff, Module::Build actually drags in ExtUtils::MakeMaker on Fedora and CentOS, so all this does is introducing churn every time guests are updated. SNACK; an alternative patch is https://www.redhat.com/archives/libvir-list/2018-May/msg01298.html -- Andrea Bolognani / Red Hat / Virtualization
Module::Build requires Package::Constants in order to create distribution archives, but on some operating systems there is no explicit dependency dragging it the latter when installing the former, so we need to handle it ourselves. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- It looks like this packages is not strictly necessary, but it gets dragged in on same operating systems so it might be a good idea to install it. guests/vars/mappings.yml | 6 ++++++ guests/vars/projects/libvirt-perl.yml | 1 + guests/vars/projects/libvirt-tck.yml | 1 + 3 files changed, 8 insertions(+) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 14e0150..8b4c018 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -574,6 +574,12 @@ mappings: pkg: p5-Module-Build rpm: perl-Module-Build + perl-Package-Constants: + deb: libpackage-constants-perl + pkg: p5-Package-Constants + rpm: perl-Package-Constants + Ubuntu14: + perl-Sub-Uplevel: deb: libsub-uplevel-perl pkg: p5-Sub-Uplevel diff --git a/guests/vars/projects/libvirt-perl.yml b/guests/vars/projects/libvirt-perl.yml index 2eb14f2..043c2c7 100644 --- a/guests/vars/projects/libvirt-perl.yml +++ b/guests/vars/projects/libvirt-perl.yml @@ -3,6 +3,7 @@ packages: - perl-Archive-Tar - perl-CPAN-Changes - perl-Module-Build + - perl-Package-Constants - perl-Test-Pod - perl-Test-Pod-Coverage - perl-Time-HiRes diff --git a/guests/vars/projects/libvirt-tck.yml b/guests/vars/projects/libvirt-tck.yml index dcccc0f..c0a2fa8 100644 --- a/guests/vars/projects/libvirt-tck.yml +++ b/guests/vars/projects/libvirt-tck.yml @@ -8,6 +8,7 @@ packages: - perl-IO-Compress-Bzip2 - perl-IO-String - perl-Module-Build + - perl-Package-Constants - perl-Sub-Uplevel - perl-TAP-Formatter-HTML - perl-TAP-Formatter-JUnit -- 2.17.0
On Wed, May 16, 2018 at 10:52:38AM +0200, Andrea Bolognani wrote:
Module::Build requires Package::Constants in order to create distribution archives, but on some operating systems there is no explicit dependency dragging it the latter when installing the former, so we need to handle it ourselves.
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- It looks like this packages is not strictly necessary, but it gets dragged in on same operating systems so it might be a good idea to install it.
guests/vars/mappings.yml | 6 ++++++ guests/vars/projects/libvirt-perl.yml | 1 + guests/vars/projects/libvirt-tck.yml | 1 + 3 files changed, 8 insertions(+)
Again, curious why this isn't causing build failures already if it is needed ?
diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 14e0150..8b4c018 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -574,6 +574,12 @@ mappings: pkg: p5-Module-Build rpm: perl-Module-Build
+ perl-Package-Constants: + deb: libpackage-constants-perl + pkg: p5-Package-Constants + rpm: perl-Package-Constants + Ubuntu14: + perl-Sub-Uplevel: deb: libsub-uplevel-perl pkg: p5-Sub-Uplevel diff --git a/guests/vars/projects/libvirt-perl.yml b/guests/vars/projects/libvirt-perl.yml index 2eb14f2..043c2c7 100644 --- a/guests/vars/projects/libvirt-perl.yml +++ b/guests/vars/projects/libvirt-perl.yml @@ -3,6 +3,7 @@ packages: - perl-Archive-Tar - perl-CPAN-Changes - perl-Module-Build + - perl-Package-Constants - perl-Test-Pod - perl-Test-Pod-Coverage - perl-Time-HiRes diff --git a/guests/vars/projects/libvirt-tck.yml b/guests/vars/projects/libvirt-tck.yml index dcccc0f..c0a2fa8 100644 --- a/guests/vars/projects/libvirt-tck.yml +++ b/guests/vars/projects/libvirt-tck.yml @@ -8,6 +8,7 @@ packages: - perl-IO-Compress-Bzip2 - perl-IO-String - perl-Module-Build + - perl-Package-Constants - perl-Sub-Uplevel - perl-TAP-Formatter-HTML - perl-TAP-Formatter-JUnit
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> 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 :|
Module::Build uses different paths for installation than those used by ExtUtils::MakeMaker, so we have to update the environment accordingly. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- guests/host_vars/libvirt-centos-6/main.yml | 2 +- guests/host_vars/libvirt-centos-7/main.yml | 2 +- guests/host_vars/libvirt-debian-8/main.yml | 2 +- guests/host_vars/libvirt-debian-9/main.yml | 2 +- guests/host_vars/libvirt-debian-sid/main.yml | 2 +- guests/host_vars/libvirt-fedora-27/main.yml | 2 +- guests/host_vars/libvirt-fedora-28/main.yml | 2 +- guests/host_vars/libvirt-fedora-rawhide/main.yml | 2 +- guests/host_vars/libvirt-freebsd-10/main.yml | 2 +- guests/host_vars/libvirt-freebsd-11/main.yml | 2 +- guests/host_vars/libvirt-freebsd-current/main.yml | 2 +- guests/host_vars/libvirt-ubuntu-14/main.yml | 2 +- guests/host_vars/libvirt-ubuntu-16/main.yml | 2 +- guests/host_vars/libvirt-ubuntu-18/main.yml | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/guests/host_vars/libvirt-centos-6/main.yml b/guests/host_vars/libvirt-centos-6/main.yml index fe9a47b..8b18c19 100644 --- a/guests/host_vars/libvirt-centos-6/main.yml +++ b/guests/host_vars/libvirt-centos-6/main.yml @@ -1,5 +1,5 @@ --- -PERL5LIB: $VIRT_PREFIX/lib64/perl5 +PERL5LIB: $VIRT_PREFIX/lib/perl5/x86_64-linux-thread-multi PYTHONPATH: $VIRT_PREFIX/lib64/python2.6/site-packages projects: diff --git a/guests/host_vars/libvirt-centos-7/main.yml b/guests/host_vars/libvirt-centos-7/main.yml index 62c929e..8f88615 100644 --- a/guests/host_vars/libvirt-centos-7/main.yml +++ b/guests/host_vars/libvirt-centos-7/main.yml @@ -1,5 +1,5 @@ --- -PERL5LIB: $VIRT_PREFIX/lib64/perl5 +PERL5LIB: $VIRT_PREFIX/lib/perl5/x86_64-linux-thread-multi PYTHONPATH: $VIRT_PREFIX/lib64/python2.7/site-packages projects: diff --git a/guests/host_vars/libvirt-debian-8/main.yml b/guests/host_vars/libvirt-debian-8/main.yml index cc91ef0..d0b3601 100644 --- a/guests/host_vars/libvirt-debian-8/main.yml +++ b/guests/host_vars/libvirt-debian-8/main.yml @@ -1,5 +1,5 @@ --- -PERL5LIB: $VIRT_PREFIX/lib/x86_64-linux-gnu/perl/5.20.2 +PERL5LIB: $VIRT_PREFIX/lib/perl5/x86_64-linux-gnu-thread-multi PYTHONPATH: $VIRT_PREFIX/lib/python3.4/site-packages projects: diff --git a/guests/host_vars/libvirt-debian-9/main.yml b/guests/host_vars/libvirt-debian-9/main.yml index f53ac50..caf513e 100644 --- a/guests/host_vars/libvirt-debian-9/main.yml +++ b/guests/host_vars/libvirt-debian-9/main.yml @@ -1,5 +1,5 @@ --- -PERL5LIB: $VIRT_PREFIX/lib/x86_64-linux-gnu/perl/5.24.1 +PERL5LIB: $VIRT_PREFIX/lib/perl5/x86_64-linux-gnu-thread-multi PYTHONPATH: $VIRT_PREFIX/lib/python3.5/site-packages projects: diff --git a/guests/host_vars/libvirt-debian-sid/main.yml b/guests/host_vars/libvirt-debian-sid/main.yml index bc711f5..88b8b9b 100644 --- a/guests/host_vars/libvirt-debian-sid/main.yml +++ b/guests/host_vars/libvirt-debian-sid/main.yml @@ -1,5 +1,5 @@ --- -PERL5LIB: $VIRT_PREFIX/lib/x86_64-linux-gnu/perl/5.26.2 +PERL5LIB: $VIRT_PREFIX/lib/perl5/x86_64-linux-gnu-thread-multi PYTHONPATH: $VIRT_PREFIX/lib/python3.6/site-packages projects: diff --git a/guests/host_vars/libvirt-fedora-27/main.yml b/guests/host_vars/libvirt-fedora-27/main.yml index 3f69f80..20d90c5 100644 --- a/guests/host_vars/libvirt-fedora-27/main.yml +++ b/guests/host_vars/libvirt-fedora-27/main.yml @@ -1,5 +1,5 @@ --- -PERL5LIB: $VIRT_PREFIX/lib64/perl5 +PERL5LIB: $VIRT_PREFIX/lib/perl5/x86_64-linux-thread-multi PYTHONPATH: $VIRT_PREFIX/lib64/python3.6/site-packages projects: diff --git a/guests/host_vars/libvirt-fedora-28/main.yml b/guests/host_vars/libvirt-fedora-28/main.yml index 3f69f80..20d90c5 100644 --- a/guests/host_vars/libvirt-fedora-28/main.yml +++ b/guests/host_vars/libvirt-fedora-28/main.yml @@ -1,5 +1,5 @@ --- -PERL5LIB: $VIRT_PREFIX/lib64/perl5 +PERL5LIB: $VIRT_PREFIX/lib/perl5/x86_64-linux-thread-multi PYTHONPATH: $VIRT_PREFIX/lib64/python3.6/site-packages projects: diff --git a/guests/host_vars/libvirt-fedora-rawhide/main.yml b/guests/host_vars/libvirt-fedora-rawhide/main.yml index 82d46e8..202eccf 100644 --- a/guests/host_vars/libvirt-fedora-rawhide/main.yml +++ b/guests/host_vars/libvirt-fedora-rawhide/main.yml @@ -1,5 +1,5 @@ --- -PERL5LIB: $VIRT_PREFIX/lib64/perl5 +PERL5LIB: $VIRT_PREFIX/lib/perl5/x86_64-linux-thread-multi PYTHONPATH: $VIRT_PREFIX/lib64/python3.6/site-packages projects: diff --git a/guests/host_vars/libvirt-freebsd-10/main.yml b/guests/host_vars/libvirt-freebsd-10/main.yml index ab5e367..ac5f12b 100644 --- a/guests/host_vars/libvirt-freebsd-10/main.yml +++ b/guests/host_vars/libvirt-freebsd-10/main.yml @@ -1,7 +1,7 @@ --- ansible_python_interpreter: /usr/local/bin/python2 -PERL5LIB: $VIRT_PREFIX/lib/perl5/site_perl/mach/5.26 +PERL5LIB: $VIRT_PREFIX/lib/perl5/amd64-freebsd-thread-multi PYTHONPATH: $VIRT_PREFIX/lib/python3.6/site-packages projects: diff --git a/guests/host_vars/libvirt-freebsd-11/main.yml b/guests/host_vars/libvirt-freebsd-11/main.yml index ab5e367..ac5f12b 100644 --- a/guests/host_vars/libvirt-freebsd-11/main.yml +++ b/guests/host_vars/libvirt-freebsd-11/main.yml @@ -1,7 +1,7 @@ --- ansible_python_interpreter: /usr/local/bin/python2 -PERL5LIB: $VIRT_PREFIX/lib/perl5/site_perl/mach/5.26 +PERL5LIB: $VIRT_PREFIX/lib/perl5/amd64-freebsd-thread-multi PYTHONPATH: $VIRT_PREFIX/lib/python3.6/site-packages projects: diff --git a/guests/host_vars/libvirt-freebsd-current/main.yml b/guests/host_vars/libvirt-freebsd-current/main.yml index ab5e367..ac5f12b 100644 --- a/guests/host_vars/libvirt-freebsd-current/main.yml +++ b/guests/host_vars/libvirt-freebsd-current/main.yml @@ -1,7 +1,7 @@ --- ansible_python_interpreter: /usr/local/bin/python2 -PERL5LIB: $VIRT_PREFIX/lib/perl5/site_perl/mach/5.26 +PERL5LIB: $VIRT_PREFIX/lib/perl5/amd64-freebsd-thread-multi PYTHONPATH: $VIRT_PREFIX/lib/python3.6/site-packages projects: diff --git a/guests/host_vars/libvirt-ubuntu-14/main.yml b/guests/host_vars/libvirt-ubuntu-14/main.yml index 24e079c..fccd0ef 100644 --- a/guests/host_vars/libvirt-ubuntu-14/main.yml +++ b/guests/host_vars/libvirt-ubuntu-14/main.yml @@ -1,5 +1,5 @@ --- -PERL5LIB: $VIRT_PREFIX/lib/perl/5.18.2 +PERL5LIB: $VIRT_PREFIX/lib/perl5/x86_64-linux-gnu-thread-multi PYTHONPATH: $VIRT_PREFIX/lib/python3.4/site-packages projects: diff --git a/guests/host_vars/libvirt-ubuntu-16/main.yml b/guests/host_vars/libvirt-ubuntu-16/main.yml index 0760a0d..caf513e 100644 --- a/guests/host_vars/libvirt-ubuntu-16/main.yml +++ b/guests/host_vars/libvirt-ubuntu-16/main.yml @@ -1,5 +1,5 @@ --- -PERL5LIB: $VIRT_PREFIX/lib/x86_64-linux-gnu/perl/5.22.1 +PERL5LIB: $VIRT_PREFIX/lib/perl5/x86_64-linux-gnu-thread-multi PYTHONPATH: $VIRT_PREFIX/lib/python3.5/site-packages projects: diff --git a/guests/host_vars/libvirt-ubuntu-18/main.yml b/guests/host_vars/libvirt-ubuntu-18/main.yml index f5eb52c..88b8b9b 100644 --- a/guests/host_vars/libvirt-ubuntu-18/main.yml +++ b/guests/host_vars/libvirt-ubuntu-18/main.yml @@ -1,5 +1,5 @@ --- -PERL5LIB: $VIRT_PREFIX/lib/x86_64-linux-gnu/perl/5.26.1 +PERL5LIB: $VIRT_PREFIX/lib/perl5/x86_64-linux-gnu-thread-multi PYTHONPATH: $VIRT_PREFIX/lib/python3.6/site-packages projects: -- 2.17.0
On Wed, May 16, 2018 at 01:58:01PM +0200, Andrea Bolognani wrote:
Module::Build uses different paths for installation than those used by ExtUtils::MakeMaker, so we have to update the environment accordingly.
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- guests/host_vars/libvirt-centos-6/main.yml | 2 +- guests/host_vars/libvirt-centos-7/main.yml | 2 +- guests/host_vars/libvirt-debian-8/main.yml | 2 +- guests/host_vars/libvirt-debian-9/main.yml | 2 +- guests/host_vars/libvirt-debian-sid/main.yml | 2 +- guests/host_vars/libvirt-fedora-27/main.yml | 2 +- guests/host_vars/libvirt-fedora-28/main.yml | 2 +- guests/host_vars/libvirt-fedora-rawhide/main.yml | 2 +- guests/host_vars/libvirt-freebsd-10/main.yml | 2 +- guests/host_vars/libvirt-freebsd-11/main.yml | 2 +- guests/host_vars/libvirt-freebsd-current/main.yml | 2 +- guests/host_vars/libvirt-ubuntu-14/main.yml | 2 +- guests/host_vars/libvirt-ubuntu-16/main.yml | 2 +- guests/host_vars/libvirt-ubuntu-18/main.yml | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> 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 :|
It's no longer used anywhere. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- guests/vars/mappings.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 14e0150..af026e1 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -549,11 +549,6 @@ mappings: CentOS6: Ubuntu14: - perl-ExtUtils-MakeMaker: - deb: perl-modules - pkg: p5-ExtUtils-MakeMaker - rpm: perl-ExtUtils-MakeMaker - perl-File-Slurp: deb: libfile-slurp-perl pkg: p5-File-Slurp -- 2.17.0
participants (2)
-
Andrea Bolognani -
Daniel P. Berrangé