From nobody Fri May 3 17:18:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 152692180469339.791750064132884; Mon, 21 May 2018 09:56:44 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 06A5F30D5AE3; Mon, 21 May 2018 16:56:43 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C1748977C8; Mon, 21 May 2018 16:56:42 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D761A180B536; Mon, 21 May 2018 16:56:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4LGrZUo003882 for ; Mon, 21 May 2018 12:53:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 02519215CDAA; Mon, 21 May 2018 16:53:35 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.40.205.87]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 71F88215CDA7 for ; Mon, 21 May 2018 16:53:34 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Mon, 21 May 2018 18:53:23 +0200 Message-Id: <20180521165327.22427-2-abologna@redhat.com> In-Reply-To: <20180521165327.22427-1-abologna@redhat.com> References: <20180521165327.22427-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH 1/5] guests: Add .j2 extension to existing templates X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Mon, 21 May 2018 16:56:43 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" By convention, Jinja2 templates should use the .j2 extension. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- guests/tasks/users.yml | 2 +- guests/templates/{bash_profile =3D> bash_profile.j2} | 0 guests/templates/{bashrc =3D> bashrc.j2} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename guests/templates/{bash_profile =3D> bash_profile.j2} (100%) rename guests/templates/{bashrc =3D> bashrc.j2} (100%) diff --git a/guests/tasks/users.yml b/guests/tasks/users.yml index 033ca2a..7b37842 100644 --- a/guests/tasks/users.yml +++ b/guests/tasks/users.yml @@ -98,7 +98,7 @@ =20 - name: '{{ flavor }}: Create shell profile' template: - src: templates/{{ item }} + src: templates/{{ item }}.j2 dest: /home/{{ flavor }}/.{{ item }} owner: '{{ flavor }}' group: '{{ flavor }}' diff --git a/guests/templates/bash_profile b/guests/templates/bash_profile.= j2 similarity index 100% rename from guests/templates/bash_profile rename to guests/templates/bash_profile.j2 diff --git a/guests/templates/bashrc b/guests/templates/bashrc.j2 similarity index 100% rename from guests/templates/bashrc rename to guests/templates/bashrc.j2 --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 17:18:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526921626939615.8692169273156; Mon, 21 May 2018 09:53:46 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5B74DA7028; Mon, 21 May 2018 16:53:45 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 25FE31779D; Mon, 21 May 2018 16:53:45 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D8407180B536; Mon, 21 May 2018 16:53:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4LGrahg003889 for ; Mon, 21 May 2018 12:53:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id 304C8215CDAA; Mon, 21 May 2018 16:53:36 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.40.205.87]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6E242215CDA7 for ; Mon, 21 May 2018 16:53:35 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Mon, 21 May 2018 18:53:24 +0200 Message-Id: <20180521165327.22427-3-abologna@redhat.com> In-Reply-To: <20180521165327.22427-1-abologna@redhat.com> References: <20180521165327.22427-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH 2/5] guests: Remove distinction between files and templates X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 21 May 2018 16:53:46 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The main difference between files and templates is that the former can can be uploaded as-is, while the latter has to go through Jinja2 first. Since the overhead of template processing is negligible, and there's a fair chance we will need to start using templating for files that currently don't need it or viceversa, let's get rid of the distinction altogether. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- guests/tasks/base.yml | 12 ++++++------ guests/tasks/users.yml | 4 ++-- .../{files/ccache.conf =3D> templates/ccache.conf.j2} | 0 .../fedora-rawhide-kernel-nodebug.repo.j2} | 0 .../jessie-backports.preferences.j2} | 0 .../jessie-backports.sources.j2} | 0 6 files changed, 8 insertions(+), 8 deletions(-) rename guests/{files/ccache.conf =3D> templates/ccache.conf.j2} (100%) rename guests/{files/fedora-rawhide-kernel-nodebug.repo =3D> templates/fed= ora-rawhide-kernel-nodebug.repo.j2} (100%) rename guests/{files/jessie-backports.preferences =3D> templates/jessie-ba= ckports.preferences.j2} (100%) rename guests/{files/jessie-backports.sources =3D> templates/jessie-backpo= rts.sources.j2} (100%) diff --git a/guests/tasks/base.yml b/guests/tasks/base.yml index 70d5abc..aac5d4f 100644 --- a/guests/tasks/base.yml +++ b/guests/tasks/base.yml @@ -67,8 +67,8 @@ os_name =3D=3D 'Fedora' ) =20 - name: Enable jessie-backports repository - copy: - src: files/jessie-backports.sources + template: + src: templates/jessie-backports.sources.j2 dest: /etc/apt/sources.list.d/jessie-backports.list owner: root group: root @@ -78,8 +78,8 @@ - flavor =3D=3D 'jenkins' =20 - name: Configure APT pinning for jessie-backports - copy: - src: files/jessie-backports.preferences + template: + src: templates/jessie-backports.preferences.j2 dest: /etc/apt/preferences.d/jessie-backports owner: root group: root @@ -89,8 +89,8 @@ - flavor =3D=3D 'jenkins' =20 - name: Enable fedora-rawhide-kernel-nodebug repository - copy: - src: files/fedora-rawhide-kernel-nodebug.repo + template: + src: templates/fedora-rawhide-kernel-nodebug.repo.j2 dest: /etc/yum.repos.d/fedora-rawhide-kernel-nodebug.repo owner: root group: root diff --git a/guests/tasks/users.yml b/guests/tasks/users.yml index 7b37842..9c5c34d 100644 --- a/guests/tasks/users.yml +++ b/guests/tasks/users.yml @@ -62,8 +62,8 @@ - ccache/bin =20 - name: '{{ flavor }}: Configure ccache' - copy: - src: files/ccache.conf + template: + src: templates/ccache.conf.j2 dest: /home/{{ flavor }}/.ccache/ccache.conf owner: '{{ flavor }}' group: '{{ flavor }}' diff --git a/guests/files/ccache.conf b/guests/templates/ccache.conf.j2 similarity index 100% rename from guests/files/ccache.conf rename to guests/templates/ccache.conf.j2 diff --git a/guests/files/fedora-rawhide-kernel-nodebug.repo b/guests/templ= ates/fedora-rawhide-kernel-nodebug.repo.j2 similarity index 100% rename from guests/files/fedora-rawhide-kernel-nodebug.repo rename to guests/templates/fedora-rawhide-kernel-nodebug.repo.j2 diff --git a/guests/files/jessie-backports.preferences b/guests/templates/j= essie-backports.preferences.j2 similarity index 100% rename from guests/files/jessie-backports.preferences rename to guests/templates/jessie-backports.preferences.j2 diff --git a/guests/files/jessie-backports.sources b/guests/templates/jessi= e-backports.sources.j2 similarity index 100% rename from guests/files/jessie-backports.sources rename to guests/templates/jessie-backports.sources.j2 --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 17:18:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526921621426438.7685073296925; Mon, 21 May 2018 09:53:41 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1132AC113807; Mon, 21 May 2018 16:53:40 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D25E330001E5; Mon, 21 May 2018 16:53:39 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 4FF763FCFC; Mon, 21 May 2018 16:53:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4LGrbVG003895 for ; Mon, 21 May 2018 12:53:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 28A9C215CDAA; Mon, 21 May 2018 16:53:37 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.40.205.87]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 854D8215CDA7 for ; Mon, 21 May 2018 16:53:36 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Mon, 21 May 2018 18:53:25 +0200 Message-Id: <20180521165327.22427-4-abologna@redhat.com> In-Reply-To: <20180521165327.22427-1-abologna@redhat.com> References: <20180521165327.22427-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH 3/5] guests: Make PERL5LIB dynamic X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 21 May 2018 16:53:40 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Instead of having to specify this separately for every guest due to minor differences in the environment, figure it out at login time by asking Perl itself for the information we need. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- guests/group_vars/all/main.yml | 1 - guests/host_vars/libvirt-centos-6/main.yml | 1 - guests/host_vars/libvirt-centos-7/main.yml | 1 - guests/host_vars/libvirt-debian-8/main.yml | 1 - guests/host_vars/libvirt-debian-9/main.yml | 1 - guests/host_vars/libvirt-debian-sid/main.yml | 1 - guests/host_vars/libvirt-fedora-27/main.yml | 1 - guests/host_vars/libvirt-fedora-28/main.yml | 1 - guests/host_vars/libvirt-fedora-rawhide/main.yml | 1 - guests/host_vars/libvirt-freebsd-10/main.yml | 1 - guests/host_vars/libvirt-freebsd-11/main.yml | 1 - guests/host_vars/libvirt-freebsd-current/main.yml | 1 - guests/host_vars/libvirt-ubuntu-14/main.yml | 1 - guests/host_vars/libvirt-ubuntu-16/main.yml | 1 - guests/host_vars/libvirt-ubuntu-18/main.yml | 1 - guests/templates/bashrc.j2 | 6 +++++- 16 files changed, 5 insertions(+), 16 deletions(-) diff --git a/guests/group_vars/all/main.yml b/guests/group_vars/all/main.yml index cd8ef25..840c80b 100644 --- a/guests/group_vars/all/main.yml +++ b/guests/group_vars/all/main.yml @@ -16,5 +16,4 @@ PKG_CONFIG_PATH: $VIRT_PREFIX/lib/pkgconfig XDG_DATA_DIRS: $VIRT_PREFIX/share:/usr/share:/usr/local/share GI_TYPELIB_PATH: $VIRT_PREFIX/lib/girepository-1.0 OSINFO_SYSTEM_DIR: $VIRT_PREFIX/share/osinfo -PERL5LIB: PYTHONPATH: diff --git a/guests/host_vars/libvirt-centos-6/main.yml b/guests/host_vars/= libvirt-centos-6/main.yml index 8b18c19..c27c1ad 100644 --- a/guests/host_vars/libvirt-centos-6/main.yml +++ b/guests/host_vars/libvirt-centos-6/main.yml @@ -1,5 +1,4 @@ --- -PERL5LIB: $VIRT_PREFIX/lib/perl5/x86_64-linux-thread-multi PYTHONPATH: $VIRT_PREFIX/lib64/python2.6/site-packages =20 projects: diff --git a/guests/host_vars/libvirt-centos-7/main.yml b/guests/host_vars/= libvirt-centos-7/main.yml index 8f88615..6cb8995 100644 --- a/guests/host_vars/libvirt-centos-7/main.yml +++ b/guests/host_vars/libvirt-centos-7/main.yml @@ -1,5 +1,4 @@ --- -PERL5LIB: $VIRT_PREFIX/lib/perl5/x86_64-linux-thread-multi PYTHONPATH: $VIRT_PREFIX/lib64/python2.7/site-packages =20 projects: diff --git a/guests/host_vars/libvirt-debian-8/main.yml b/guests/host_vars/= libvirt-debian-8/main.yml index d0b3601..64f3255 100644 --- a/guests/host_vars/libvirt-debian-8/main.yml +++ b/guests/host_vars/libvirt-debian-8/main.yml @@ -1,5 +1,4 @@ --- -PERL5LIB: $VIRT_PREFIX/lib/perl5/x86_64-linux-gnu-thread-multi PYTHONPATH: $VIRT_PREFIX/lib/python3.4/site-packages =20 projects: diff --git a/guests/host_vars/libvirt-debian-9/main.yml b/guests/host_vars/= libvirt-debian-9/main.yml index caf513e..04d5132 100644 --- a/guests/host_vars/libvirt-debian-9/main.yml +++ b/guests/host_vars/libvirt-debian-9/main.yml @@ -1,5 +1,4 @@ --- -PERL5LIB: $VIRT_PREFIX/lib/perl5/x86_64-linux-gnu-thread-multi PYTHONPATH: $VIRT_PREFIX/lib/python3.5/site-packages =20 projects: diff --git a/guests/host_vars/libvirt-debian-sid/main.yml b/guests/host_var= s/libvirt-debian-sid/main.yml index 88b8b9b..cbf57aa 100644 --- a/guests/host_vars/libvirt-debian-sid/main.yml +++ b/guests/host_vars/libvirt-debian-sid/main.yml @@ -1,5 +1,4 @@ --- -PERL5LIB: $VIRT_PREFIX/lib/perl5/x86_64-linux-gnu-thread-multi PYTHONPATH: $VIRT_PREFIX/lib/python3.6/site-packages =20 projects: diff --git a/guests/host_vars/libvirt-fedora-27/main.yml b/guests/host_vars= /libvirt-fedora-27/main.yml index 20d90c5..9ed392b 100644 --- a/guests/host_vars/libvirt-fedora-27/main.yml +++ b/guests/host_vars/libvirt-fedora-27/main.yml @@ -1,5 +1,4 @@ --- -PERL5LIB: $VIRT_PREFIX/lib/perl5/x86_64-linux-thread-multi PYTHONPATH: $VIRT_PREFIX/lib64/python3.6/site-packages =20 projects: diff --git a/guests/host_vars/libvirt-fedora-28/main.yml b/guests/host_vars= /libvirt-fedora-28/main.yml index 20d90c5..9ed392b 100644 --- a/guests/host_vars/libvirt-fedora-28/main.yml +++ b/guests/host_vars/libvirt-fedora-28/main.yml @@ -1,5 +1,4 @@ --- -PERL5LIB: $VIRT_PREFIX/lib/perl5/x86_64-linux-thread-multi PYTHONPATH: $VIRT_PREFIX/lib64/python3.6/site-packages =20 projects: diff --git a/guests/host_vars/libvirt-fedora-rawhide/main.yml b/guests/host= _vars/libvirt-fedora-rawhide/main.yml index 202eccf..91b4158 100644 --- a/guests/host_vars/libvirt-fedora-rawhide/main.yml +++ b/guests/host_vars/libvirt-fedora-rawhide/main.yml @@ -1,5 +1,4 @@ --- -PERL5LIB: $VIRT_PREFIX/lib/perl5/x86_64-linux-thread-multi PYTHONPATH: $VIRT_PREFIX/lib64/python3.6/site-packages =20 projects: diff --git a/guests/host_vars/libvirt-freebsd-10/main.yml b/guests/host_var= s/libvirt-freebsd-10/main.yml index ac5f12b..e37c845 100644 --- a/guests/host_vars/libvirt-freebsd-10/main.yml +++ b/guests/host_vars/libvirt-freebsd-10/main.yml @@ -1,7 +1,6 @@ --- ansible_python_interpreter: /usr/local/bin/python2 =20 -PERL5LIB: $VIRT_PREFIX/lib/perl5/amd64-freebsd-thread-multi PYTHONPATH: $VIRT_PREFIX/lib/python3.6/site-packages =20 projects: diff --git a/guests/host_vars/libvirt-freebsd-11/main.yml b/guests/host_var= s/libvirt-freebsd-11/main.yml index ac5f12b..e37c845 100644 --- a/guests/host_vars/libvirt-freebsd-11/main.yml +++ b/guests/host_vars/libvirt-freebsd-11/main.yml @@ -1,7 +1,6 @@ --- ansible_python_interpreter: /usr/local/bin/python2 =20 -PERL5LIB: $VIRT_PREFIX/lib/perl5/amd64-freebsd-thread-multi PYTHONPATH: $VIRT_PREFIX/lib/python3.6/site-packages =20 projects: diff --git a/guests/host_vars/libvirt-freebsd-current/main.yml b/guests/hos= t_vars/libvirt-freebsd-current/main.yml index ac5f12b..e37c845 100644 --- a/guests/host_vars/libvirt-freebsd-current/main.yml +++ b/guests/host_vars/libvirt-freebsd-current/main.yml @@ -1,7 +1,6 @@ --- ansible_python_interpreter: /usr/local/bin/python2 =20 -PERL5LIB: $VIRT_PREFIX/lib/perl5/amd64-freebsd-thread-multi PYTHONPATH: $VIRT_PREFIX/lib/python3.6/site-packages =20 projects: diff --git a/guests/host_vars/libvirt-ubuntu-14/main.yml b/guests/host_vars= /libvirt-ubuntu-14/main.yml index fccd0ef..bfbdda6 100644 --- a/guests/host_vars/libvirt-ubuntu-14/main.yml +++ b/guests/host_vars/libvirt-ubuntu-14/main.yml @@ -1,5 +1,4 @@ --- -PERL5LIB: $VIRT_PREFIX/lib/perl5/x86_64-linux-gnu-thread-multi PYTHONPATH: $VIRT_PREFIX/lib/python3.4/site-packages =20 projects: diff --git a/guests/host_vars/libvirt-ubuntu-16/main.yml b/guests/host_vars= /libvirt-ubuntu-16/main.yml index caf513e..04d5132 100644 --- a/guests/host_vars/libvirt-ubuntu-16/main.yml +++ b/guests/host_vars/libvirt-ubuntu-16/main.yml @@ -1,5 +1,4 @@ --- -PERL5LIB: $VIRT_PREFIX/lib/perl5/x86_64-linux-gnu-thread-multi PYTHONPATH: $VIRT_PREFIX/lib/python3.5/site-packages =20 projects: diff --git a/guests/host_vars/libvirt-ubuntu-18/main.yml b/guests/host_vars= /libvirt-ubuntu-18/main.yml index 88b8b9b..cbf57aa 100644 --- a/guests/host_vars/libvirt-ubuntu-18/main.yml +++ b/guests/host_vars/libvirt-ubuntu-18/main.yml @@ -1,5 +1,4 @@ --- -PERL5LIB: $VIRT_PREFIX/lib/perl5/x86_64-linux-gnu-thread-multi PYTHONPATH: $VIRT_PREFIX/lib/python3.6/site-packages =20 projects: diff --git a/guests/templates/bashrc.j2 b/guests/templates/bashrc.j2 index 866087e..cf2679e 100644 --- a/guests/templates/bashrc.j2 +++ b/guests/templates/bashrc.j2 @@ -8,12 +8,16 @@ export PKG_CONFIG_PATH=3D"{{ PKG_CONFIG_PATH }}" export XDG_DATA_DIRS=3D"{{ XDG_DATA_DIRS }}" export GI_TYPELIB_PATH=3D"{{ GI_TYPELIB_PATH }}" export OSINFO_SYSTEM_DIR=3D"{{ OSINFO_SYSTEM_DIR }}" -export PERL5LIB=3D"{{ PERL5LIB }}" export PYTHONPATH=3D"{{ PYTHONPATH }}" =20 export MAKE=3D"{{ make }}" export PYTHON=3D"{{ python }}" =20 +# We need to ask Perl for this information, since it's used to +# construct installation paths +plarch=3D$(perl -e 'use Config; print $Config{archname}') +export PERL5LIB=3D"$VIRT_PREFIX/lib/perl5/$plarch" + # Enable bash completion. Only needed on FreeBSD, the system-wide # shell profile will take care of it for us everywhere else bash_completion=3D/usr/local/share/bash-completion/bash_completion.sh --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 17:18:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526921627153187.36387662113964; Mon, 21 May 2018 09:53:47 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AB814350076; Mon, 21 May 2018 16:53:45 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 81FA3177A7; Mon, 21 May 2018 16:53:45 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 34A3E180B5AA; Mon, 21 May 2018 16:53:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4LGrchn003900 for ; Mon, 21 May 2018 12:53:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3D705215CDAC; Mon, 21 May 2018 16:53:38 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.40.205.87]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7CCF1215CDA7 for ; Mon, 21 May 2018 16:53:37 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Mon, 21 May 2018 18:53:26 +0200 Message-Id: <20180521165327.22427-5-abologna@redhat.com> In-Reply-To: <20180521165327.22427-1-abologna@redhat.com> References: <20180521165327.22427-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH 4/5] guests: Make PYTHONPATH dynamic X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 21 May 2018 16:53:46 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Instead of having to specify this separately for every guest due to minor differences in the environment, figure it out at login time by asking Python itself for the information we need. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- guests/group_vars/all/main.yml | 1 - 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 -- guests/templates/bashrc.j2 | 10 +++++++++- 16 files changed, 9 insertions(+), 30 deletions(-) diff --git a/guests/group_vars/all/main.yml b/guests/group_vars/all/main.yml index 840c80b..2641c33 100644 --- a/guests/group_vars/all/main.yml +++ b/guests/group_vars/all/main.yml @@ -16,4 +16,3 @@ PKG_CONFIG_PATH: $VIRT_PREFIX/lib/pkgconfig XDG_DATA_DIRS: $VIRT_PREFIX/share:/usr/share:/usr/local/share GI_TYPELIB_PATH: $VIRT_PREFIX/lib/girepository-1.0 OSINFO_SYSTEM_DIR: $VIRT_PREFIX/share/osinfo -PYTHONPATH: diff --git a/guests/host_vars/libvirt-centos-6/main.yml b/guests/host_vars/= libvirt-centos-6/main.yml index c27c1ad..265c622 100644 --- a/guests/host_vars/libvirt-centos-6/main.yml +++ b/guests/host_vars/libvirt-centos-6/main.yml @@ -1,5 +1,3 @@ --- -PYTHONPATH: $VIRT_PREFIX/lib64/python2.6/site-packages - projects: - libvirt+website diff --git a/guests/host_vars/libvirt-centos-7/main.yml b/guests/host_vars/= libvirt-centos-7/main.yml index 6cb8995..c147830 100644 --- a/guests/host_vars/libvirt-centos-7/main.yml +++ b/guests/host_vars/libvirt-centos-7/main.yml @@ -1,6 +1,4 @@ --- -PYTHONPATH: $VIRT_PREFIX/lib64/python2.7/site-packages - projects: - libosinfo - libvirt diff --git a/guests/host_vars/libvirt-debian-8/main.yml b/guests/host_vars/= libvirt-debian-8/main.yml index 64f3255..954a037 100644 --- a/guests/host_vars/libvirt-debian-8/main.yml +++ b/guests/host_vars/libvirt-debian-8/main.yml @@ -1,6 +1,4 @@ --- -PYTHONPATH: $VIRT_PREFIX/lib/python3.4/site-packages - projects: - libosinfo - libvirt diff --git a/guests/host_vars/libvirt-debian-9/main.yml b/guests/host_vars/= libvirt-debian-9/main.yml index 04d5132..a588c09 100644 --- a/guests/host_vars/libvirt-debian-9/main.yml +++ b/guests/host_vars/libvirt-debian-9/main.yml @@ -1,6 +1,4 @@ --- -PYTHONPATH: $VIRT_PREFIX/lib/python3.5/site-packages - projects: - libosinfo - libvirt diff --git a/guests/host_vars/libvirt-debian-sid/main.yml b/guests/host_var= s/libvirt-debian-sid/main.yml index cbf57aa..a588c09 100644 --- a/guests/host_vars/libvirt-debian-sid/main.yml +++ b/guests/host_vars/libvirt-debian-sid/main.yml @@ -1,6 +1,4 @@ --- -PYTHONPATH: $VIRT_PREFIX/lib/python3.6/site-packages - projects: - libosinfo - libvirt diff --git a/guests/host_vars/libvirt-fedora-27/main.yml b/guests/host_vars= /libvirt-fedora-27/main.yml index 9ed392b..00b0848 100644 --- a/guests/host_vars/libvirt-fedora-27/main.yml +++ b/guests/host_vars/libvirt-fedora-27/main.yml @@ -1,6 +1,4 @@ --- -PYTHONPATH: $VIRT_PREFIX/lib64/python3.6/site-packages - projects: - libosinfo - libvirt diff --git a/guests/host_vars/libvirt-fedora-28/main.yml b/guests/host_vars= /libvirt-fedora-28/main.yml index 9ed392b..00b0848 100644 --- a/guests/host_vars/libvirt-fedora-28/main.yml +++ b/guests/host_vars/libvirt-fedora-28/main.yml @@ -1,6 +1,4 @@ --- -PYTHONPATH: $VIRT_PREFIX/lib64/python3.6/site-packages - projects: - libosinfo - libvirt diff --git a/guests/host_vars/libvirt-fedora-rawhide/main.yml b/guests/host= _vars/libvirt-fedora-rawhide/main.yml index 91b4158..5044594 100644 --- a/guests/host_vars/libvirt-fedora-rawhide/main.yml +++ b/guests/host_vars/libvirt-fedora-rawhide/main.yml @@ -1,6 +1,4 @@ --- -PYTHONPATH: $VIRT_PREFIX/lib64/python3.6/site-packages - projects: - libosinfo - libosinfo+mingw diff --git a/guests/host_vars/libvirt-freebsd-10/main.yml b/guests/host_var= s/libvirt-freebsd-10/main.yml index e37c845..2ad4584 100644 --- a/guests/host_vars/libvirt-freebsd-10/main.yml +++ b/guests/host_vars/libvirt-freebsd-10/main.yml @@ -1,8 +1,6 @@ --- ansible_python_interpreter: /usr/local/bin/python2 =20 -PYTHONPATH: $VIRT_PREFIX/lib/python3.6/site-packages - projects: - libosinfo - libvirt diff --git a/guests/host_vars/libvirt-freebsd-11/main.yml b/guests/host_var= s/libvirt-freebsd-11/main.yml index e37c845..2ad4584 100644 --- a/guests/host_vars/libvirt-freebsd-11/main.yml +++ b/guests/host_vars/libvirt-freebsd-11/main.yml @@ -1,8 +1,6 @@ --- ansible_python_interpreter: /usr/local/bin/python2 =20 -PYTHONPATH: $VIRT_PREFIX/lib/python3.6/site-packages - projects: - libosinfo - libvirt diff --git a/guests/host_vars/libvirt-freebsd-current/main.yml b/guests/hos= t_vars/libvirt-freebsd-current/main.yml index e37c845..2ad4584 100644 --- a/guests/host_vars/libvirt-freebsd-current/main.yml +++ b/guests/host_vars/libvirt-freebsd-current/main.yml @@ -1,8 +1,6 @@ --- ansible_python_interpreter: /usr/local/bin/python2 =20 -PYTHONPATH: $VIRT_PREFIX/lib/python3.6/site-packages - projects: - libosinfo - libvirt diff --git a/guests/host_vars/libvirt-ubuntu-14/main.yml b/guests/host_vars= /libvirt-ubuntu-14/main.yml index bfbdda6..839c668 100644 --- a/guests/host_vars/libvirt-ubuntu-14/main.yml +++ b/guests/host_vars/libvirt-ubuntu-14/main.yml @@ -1,6 +1,4 @@ --- -PYTHONPATH: $VIRT_PREFIX/lib/python3.4/site-packages - projects: - libosinfo - libvirt diff --git a/guests/host_vars/libvirt-ubuntu-16/main.yml b/guests/host_vars= /libvirt-ubuntu-16/main.yml index 04d5132..a588c09 100644 --- a/guests/host_vars/libvirt-ubuntu-16/main.yml +++ b/guests/host_vars/libvirt-ubuntu-16/main.yml @@ -1,6 +1,4 @@ --- -PYTHONPATH: $VIRT_PREFIX/lib/python3.5/site-packages - projects: - libosinfo - libvirt diff --git a/guests/host_vars/libvirt-ubuntu-18/main.yml b/guests/host_vars= /libvirt-ubuntu-18/main.yml index cbf57aa..a588c09 100644 --- a/guests/host_vars/libvirt-ubuntu-18/main.yml +++ b/guests/host_vars/libvirt-ubuntu-18/main.yml @@ -1,6 +1,4 @@ --- -PYTHONPATH: $VIRT_PREFIX/lib/python3.6/site-packages - projects: - libosinfo - libvirt diff --git a/guests/templates/bashrc.j2 b/guests/templates/bashrc.j2 index cf2679e..a4183ff 100644 --- a/guests/templates/bashrc.j2 +++ b/guests/templates/bashrc.j2 @@ -8,7 +8,6 @@ export PKG_CONFIG_PATH=3D"{{ PKG_CONFIG_PATH }}" export XDG_DATA_DIRS=3D"{{ XDG_DATA_DIRS }}" export GI_TYPELIB_PATH=3D"{{ GI_TYPELIB_PATH }}" export OSINFO_SYSTEM_DIR=3D"{{ OSINFO_SYSTEM_DIR }}" -export PYTHONPATH=3D"{{ PYTHONPATH }}" =20 export MAKE=3D"{{ make }}" export PYTHON=3D"{{ python }}" @@ -18,6 +17,15 @@ export PYTHON=3D"{{ python }}" plarch=3D$(perl -e 'use Config; print $Config{archname}') export PERL5LIB=3D"$VIRT_PREFIX/lib/perl5/$plarch" =20 +# For Python we need the version number (major and minor) and +# to know whether "lib64" paths are searched +pylib=3Dlib +if $PYTHON -c 'import sys; print("\n".join(sys.path))' | grep -q lib64; th= en + pylib=3Dlib64 +fi +pyver=3D$($PYTHON -c 'import sys; print(".".join(map(lambda x: str(sys.ver= sion_info[x]), [0,1])))') +export PYTHONPATH=3D"$VIRT_PREFIX/$pylib/python$pyver/site-packages" + # Enable bash completion. Only needed on FreeBSD, the system-wide # shell profile will take care of it for us everywhere else bash_completion=3D/usr/local/share/bash-completion/bash_completion.sh --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri May 3 17:18:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526921633278668.115397497625; Mon, 21 May 2018 09:53:53 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D72D5319B48; Mon, 21 May 2018 16:53:51 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A375460BEB; Mon, 21 May 2018 16:53:51 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 61E83180B5AA; Mon, 21 May 2018 16:53:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4LGrd4m003910 for ; Mon, 21 May 2018 12:53:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id 39F9F215CDAA; Mon, 21 May 2018 16:53:39 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.40.205.87]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A82AE215CDA7 for ; Mon, 21 May 2018 16:53:38 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Mon, 21 May 2018 18:53:27 +0200 Message-Id: <20180521165327.22427-6-abologna@redhat.com> In-Reply-To: <20180521165327.22427-1-abologna@redhat.com> References: <20180521165327.22427-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [jenkins-ci PATCH 5/5] guests: Move remaining paths out of the inventory X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 21 May 2018 16:53:52 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" None of these ever needed per-host overrides, so we can avoid one layer of indirection and store them directly in the shell profile. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- guests/group_vars/all/main.yml | 11 ----------- guests/templates/bashrc.j2 | 18 +++++++++--------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/guests/group_vars/all/main.yml b/guests/group_vars/all/main.yml index 2641c33..b73795e 100644 --- a/guests/group_vars/all/main.yml +++ b/guests/group_vars/all/main.yml @@ -5,14 +5,3 @@ ansible_ssh_pass: root =20 jenkins_url: https://ci.centos.org/computer/{{ inventory_hostname }}/slave= -agent.jnlp - -# Environment variables and paths to commands/files that might be -# OS-dependent. Can be overridden on a per-host basis -VIRT_PREFIX: $HOME/build/libvirt -PATH: $VIRT_PREFIX/bin:$HOME/.ccache/bin:$PATH -C_INCLUDE_PATH: $VIRT_PREFIX/include -LD_LIBRARY_PATH: $VIRT_PREFIX/lib -PKG_CONFIG_PATH: $VIRT_PREFIX/lib/pkgconfig -XDG_DATA_DIRS: $VIRT_PREFIX/share:/usr/share:/usr/local/share -GI_TYPELIB_PATH: $VIRT_PREFIX/lib/girepository-1.0 -OSINFO_SYSTEM_DIR: $VIRT_PREFIX/share/osinfo diff --git a/guests/templates/bashrc.j2 b/guests/templates/bashrc.j2 index a4183ff..7807fc6 100644 --- a/guests/templates/bashrc.j2 +++ b/guests/templates/bashrc.j2 @@ -1,17 +1,17 @@ export PS1=3D"[\u@\h \w]\$ " =20 -export VIRT_PREFIX=3D"{{ VIRT_PREFIX }}" -export PATH=3D"{{ PATH }}" -export C_INCLUDE_PATH=3D"{{ C_INCLUDE_PATH }}" -export LD_LIBRARY_PATH=3D"{{ LD_LIBRARY_PATH }}" -export PKG_CONFIG_PATH=3D"{{ PKG_CONFIG_PATH }}" -export XDG_DATA_DIRS=3D"{{ XDG_DATA_DIRS }}" -export GI_TYPELIB_PATH=3D"{{ GI_TYPELIB_PATH }}" -export OSINFO_SYSTEM_DIR=3D"{{ OSINFO_SYSTEM_DIR }}" - export MAKE=3D"{{ make }}" export PYTHON=3D"{{ python }}" =20 +export VIRT_PREFIX=3D"$HOME/build/libvirt" +export PATH=3D"$VIRT_PREFIX/bin:$HOME/.ccache/bin:$PATH" +export C_INCLUDE_PATH=3D"$VIRT_PREFIX/include" +export LD_LIBRARY_PATH=3D"$VIRT_PREFIX/lib" +export PKG_CONFIG_PATH=3D"$VIRT_PREFIX/lib/pkgconfig" +export XDG_DATA_DIRS=3D"$VIRT_PREFIX/share:/usr/share:/usr/local/share" +export GI_TYPELIB_PATH=3D"$VIRT_PREFIX/lib/girepository-1.0" +export OSINFO_SYSTEM_DIR=3D"$VIRT_PREFIX/share/osinfo" + # We need to ask Perl for this information, since it's used to # construct installation paths plarch=3D$(perl -e 'use Config; print $Config{archname}') --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list