Signed-off-by: Andrea Bolognani <abologna@xxxxxxxxxx>
---
ansible/host_vars/libvirt-centos-6/main.yml | 1 +
ansible/host_vars/libvirt-centos-7/main.yml | 1 +
ansible/host_vars/libvirt-debian-8/main.yml | 1 +
ansible/host_vars/libvirt-debian-9/main.yml | 1 +
ansible/host_vars/libvirt-fedora-25/main.yml | 1 +
ansible/host_vars/libvirt-fedora-26/main.yml | 1 +
ansible/host_vars/libvirt-fedora-rawhide/main.yml | 1 +
ansible/host_vars/libvirt-freebsd-10/main.yml | 1 +
ansible/host_vars/libvirt-freebsd-11/main.yml | 1 +
ansible/host_vars/libvirt-ubuntu-12/main.yml | 1 +
ansible/host_vars/libvirt-ubuntu-14/main.yml | 1 +
ansible/host_vars/libvirt-ubuntu-16/main.yml | 1 +
ansible/site.yml | 1 +
ansible/tasks/compat.yml | 31 +++
ansible/vars/mappings.yml | 296 ++++++++++++++++++++++
ansible/vars/projects/libvirt.yml | 78 ++++++
16 files changed, 418 insertions(+)
create mode 100644 ansible/tasks/compat.yml
create mode 100644 ansible/vars/projects/libvirt.yml
diff --git a/ansible/host_vars/libvirt-centos-6/main.yml b/ansible/host_vars/libvirt-centos-6/main.yml
index 1602406..4d53bb3 100644
--- a/ansible/host_vars/libvirt-centos-6/main.yml
+++ b/ansible/host_vars/libvirt-centos-6/main.yml
@@ -1,3 +1,4 @@
---
projects:
- base
+ - libvirt
diff --git a/ansible/host_vars/libvirt-centos-7/main.yml b/ansible/host_vars/libvirt-centos-7/main.yml
index a40cb4c..7508f19 100644
--- a/ansible/host_vars/libvirt-centos-7/main.yml
+++ b/ansible/host_vars/libvirt-centos-7/main.yml
@@ -2,3 +2,4 @@
projects:
- base
- libosinfo
+ - libvirt
diff --git a/ansible/host_vars/libvirt-debian-8/main.yml b/ansible/host_vars/libvirt-debian-8/main.yml
index a40cb4c..7508f19 100644
--- a/ansible/host_vars/libvirt-debian-8/main.yml
+++ b/ansible/host_vars/libvirt-debian-8/main.yml
@@ -2,3 +2,4 @@
projects:
- base
- libosinfo
+ - libvirt
diff --git a/ansible/host_vars/libvirt-debian-9/main.yml b/ansible/host_vars/libvirt-debian-9/main.yml
index a40cb4c..7508f19 100644
--- a/ansible/host_vars/libvirt-debian-9/main.yml
+++ b/ansible/host_vars/libvirt-debian-9/main.yml
@@ -2,3 +2,4 @@
projects:
- base
- libosinfo
+ - libvirt
diff --git a/ansible/host_vars/libvirt-fedora-25/main.yml b/ansible/host_vars/libvirt-fedora-25/main.yml
index a40cb4c..7508f19 100644
--- a/ansible/host_vars/libvirt-fedora-25/main.yml
+++ b/ansible/host_vars/libvirt-fedora-25/main.yml
@@ -2,3 +2,4 @@
projects:
- base
- libosinfo
+ - libvirt
diff --git a/ansible/host_vars/libvirt-fedora-26/main.yml b/ansible/host_vars/libvirt-fedora-26/main.yml
index a40cb4c..7508f19 100644
--- a/ansible/host_vars/libvirt-fedora-26/main.yml
+++ b/ansible/host_vars/libvirt-fedora-26/main.yml
@@ -2,3 +2,4 @@
projects:
- base
- libosinfo
+ - libvirt
diff --git a/ansible/host_vars/libvirt-fedora-rawhide/main.yml b/ansible/host_vars/libvirt-fedora-rawhide/main.yml
index a40cb4c..7508f19 100644
--- a/ansible/host_vars/libvirt-fedora-rawhide/main.yml
+++ b/ansible/host_vars/libvirt-fedora-rawhide/main.yml
@@ -2,3 +2,4 @@
projects:
- base
- libosinfo
+ - libvirt
diff --git a/ansible/host_vars/libvirt-freebsd-10/main.yml b/ansible/host_vars/libvirt-freebsd-10/main.yml
index 81e362d..a8766a0 100644
--- a/ansible/host_vars/libvirt-freebsd-10/main.yml
+++ b/ansible/host_vars/libvirt-freebsd-10/main.yml
@@ -9,3 +9,4 @@ sudo: /usr/local/bin/sudo
projects:
- base
- libosinfo
+ - libvirt
diff --git a/ansible/host_vars/libvirt-freebsd-11/main.yml b/ansible/host_vars/libvirt-freebsd-11/main.yml
index 81e362d..a8766a0 100644
--- a/ansible/host_vars/libvirt-freebsd-11/main.yml
+++ b/ansible/host_vars/libvirt-freebsd-11/main.yml
@@ -9,3 +9,4 @@ sudo: /usr/local/bin/sudo
projects:
- base
- libosinfo
+ - libvirt
diff --git a/ansible/host_vars/libvirt-ubuntu-12/main.yml b/ansible/host_vars/libvirt-ubuntu-12/main.yml
index 1602406..4d53bb3 100644
--- a/ansible/host_vars/libvirt-ubuntu-12/main.yml
+++ b/ansible/host_vars/libvirt-ubuntu-12/main.yml
@@ -1,3 +1,4 @@
---
projects:
- base
+ - libvirt
diff --git a/ansible/host_vars/libvirt-ubuntu-14/main.yml b/ansible/host_vars/libvirt-ubuntu-14/main.yml
index a40cb4c..7508f19 100644
--- a/ansible/host_vars/libvirt-ubuntu-14/main.yml
+++ b/ansible/host_vars/libvirt-ubuntu-14/main.yml
@@ -2,3 +2,4 @@
projects:
- base
- libosinfo
+ - libvirt
diff --git a/ansible/host_vars/libvirt-ubuntu-16/main.yml b/ansible/host_vars/libvirt-ubuntu-16/main.yml
index a40cb4c..7508f19 100644
--- a/ansible/host_vars/libvirt-ubuntu-16/main.yml
+++ b/ansible/host_vars/libvirt-ubuntu-16/main.yml
@@ -2,3 +2,4 @@
projects:
- base
- libosinfo
+ - libvirt
diff --git a/ansible/site.yml b/ansible/site.yml
index c6e6152..907a35b 100644
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -8,6 +8,7 @@
# Prepare the base environment
- include: tasks/base.yml
+ - include: tasks/compat.yml
# Install build dependencies for each project
- include: tasks/packages.yml
diff --git a/ansible/tasks/compat.yml b/ansible/tasks/compat.yml
new file mode 100644
index 0000000..001b5c6
--- /dev/null
+++ b/ansible/tasks/compat.yml
@@ -0,0 +1,31 @@
+---
+# libvirt can't detect these automatically at the moment, so a kludge
+# is required. Can be dropped it as soon as libvirt has been fixed
+- name: Create compatibility symlinks
+ file:
+ src: '/usr/local/{{ item }}'
+ dest: '/usr/{{ item }}'
+ state: link
+ force: yes
+ with_items:
+ - include/sasl
+ - include/yajl
+ - lib/libsasl2.so
+ - lib/libyajl.so
+ when:
+ - os_name == 'FreeBSD'
+
+# Same as above, except we only need to do it on FreeBSD 11 because
+# FreeBSD 10 shipped (an old version of) readline in the base system
+- name: Create compatibility symlinks
+ file:
+ src: '/usr/local/{{ item }}'
+ dest: '/usr/{{ item }}'
+ state: link
+ force: yes
+ with_items:
+ - include/readline
+ - lib/libreadline.so
+ when:
+ - os_name == 'FreeBSD'
+ - os_version == '11'
diff --git a/ansible/vars/mappings.yml b/ansible/vars/mappings.yml
index f76816b..0230047 100644
--- a/ansible/vars/mappings.yml
+++ b/ansible/vars/mappings.yml
@@ -30,6 +30,13 @@
mappings:
+ apparmor:
+ deb: libapparmor-dev
+
+ augeas:
+ default: augeas
+ deb: augeas-tools
+
autoconf:
default: autoconf
@@ -41,6 +48,11 @@ mappings:
pkg: gettext-tools
rpm: gettext-devel
+ avahi:
+ deb: libavahi-client-dev
+ pkg: avahi
+ rpm: avahi-devel
+
ccache:
default: ccache
CentOS:
@@ -53,6 +65,32 @@ mappings:
Fedora: cppi
FreeBSD: cppi
+ cyrus-sasl:
+ deb: libsasl2-dev
+ pkg: cyrus-sasl
+ rpm: cyrus-sasl-devel
+
+ device-mapper:
+ deb: libdevmapper-dev
+ rpm: device-mapper-devel
+
+ dnsmasq:
+ default: dnsmasq
+ deb: dnsmasq-base
+
+ dtrace:
+ deb: systemtap-sdt-dev
+ rpm: systemtap-sdt-devel
+
+ ebtables:
+ default: ebtables
+ FreeBSD:
+
+ fuse:
+ deb: libfuse-dev
+ pkg: fusefs-libs
+ rpm: fuse-devel
+
gcc:
default: gcc
FreeBSD:
@@ -69,9 +107,21 @@ mappings:
deb: libc6-dev
rpm: glibc-devel
+ glusterfs:
+ deb: glusterfs-client
+ pkg: glusterfs
+ rpm: glusterfs-api-devel
+
gnome-common:
default: gnome-common
+ gnutls:
+ deb: libgnutls28-dev
+ pkg: gnutls
+ rpm: gnutls-devel
+ Ubuntu12: libgnutls-dev
+ Ubuntu14: libgnutls-dev
+
gobject-introspection:
deb: libgirepository1.0-dev
pkg: gobject-introspection
@@ -82,14 +132,102 @@ mappings:
default: gtk-doc
deb: gtk-doc-tools
+ hal:
+ FreeBSD: hal
+ Ubuntu12: libhal-dev
+
intltool:
default: intltool
+ iscsiadm:
+ deb: open-iscsi
+ rpm: iscsi-initiator-utils
+
+ libacl:
+ deb: libacl1-dev
+ rpm: libacl-devel
+
+ libattr:
+ deb: libattr1-dev
+ rpm: libattr-devel
+
+ libaudit:
+ deb: libaudit-dev
+ rpm: audit-libs-devel
+
+ libblkid:
+ deb: libblkid-dev
+ rpm: libblkid-devel
+
+ libcap-ng:
+ deb: libcap-ng-dev
+ rpm: libcap-ng-devel
+
+ libcurl:
+ deb: libcurl4-gnutls-dev
+ pkg: curl
+ rpm: libcurl-devel
+
+ libdbus:
+ deb: libdbus-1-dev
+ pkg: dbus
+ rpm: dbus-devel
+
+ libnl:
+ CentOS6: libnl-devel
+
+ libnl3:
+ deb: libnl-3-dev
+ rpm: libnl3-devel
+
+ libnlroute3:
+ deb: libnl-route-3-dev
+ rpm: libnl3-devel
+
+ libnuma:
+ deb: libnuma-dev
+ rpm: numactl-devel
+
+ libparted:
+ deb: libparted-dev
+ rpm: parted-devel
+
+ libpcap:
+ deb: libpcap-dev
+ pkg: libpcap
+ rpm: libpcap-devel
+
+ libpciaccess:
+ deb: libpciaccess-dev
+ pkg: libpciaccess
+ rpm: libpciaccess-devel
+
+ librbd:
+ deb: librbd-dev
+ Fedora: librbd-devel
+ CentOS7: librbd1-devel
+
+ libselinux:
+ deb: libselinux1-dev
+ rpm: libselinux-devel
+
libsoup:
deb: libsoup2.4-dev
pkg: libsoup
rpm: libsoup-devel
+ libssh:
+ pkg: libssh
+ rpm: libssh-devel
+ Debian: libssh-gcrypt-dev
+ Ubuntu: libssh-dev
+ CentOS6:
+
+ libssh2:
+ deb: libssh2-1-dev
+ pkg: libssh2
+ rpm: libssh2-devel
+
libtool:
default: libtool
Debian: libtool-bin
@@ -98,6 +236,10 @@ mappings:
libtoolize:
default: libtool
+ libudev:
+ deb: libudev-dev
+ rpm: libudev-devel
+
libxml2:
deb: libxml2-dev
pkg: libxml2
@@ -108,10 +250,105 @@ mappings:
pkg: libxslt
rpm: libxslt-devel
+ lvm2:
+ default: lvm2
+ FreeBSD:
+
make:
default: make
FreeBSD: gmake
+ mingw32-curl:
+ FedoraRawhide: mingw32-curl
+
+ mingw32-dbus:
+ FedoraRawhide: mingw32-dbus
+
+ mingw32-dlfcn:
+ FedoraRawhide: mingw32-dlfcn
+
+ mingw32-gcc:
+ FedoraRawhide: mingw32-gcc
+
+ mingw32-gettext:
+ FedoraRawhide: mingw32-gettext
+
+ mingw32-gnutls:
+ FedoraRawhide: mingw32-gnutls
+
+ mingw32-libssh2:
+ FedoraRawhide: mingw32-libssh2
+
+ mingw32-libxml2:
+ FedoraRawhide: mingw32-libxml2
+
+ mingw32-openssl:
+ FedoraRawhide: mingw32-openssl
+
+ mingw32-pkg-config:
+ FedoraRawhide: mingw32-pkg-config
+
+ mingw32-portablexdr:
+ FedoraRawhide: mingw32-portablexdr
+
+ mingw32-readline:
+ FedoraRawhide: mingw32-readline
+
+ mingw64-curl:
+ FedoraRawhide: mingw64-curl
+
+ mingw64-dbus:
+ FedoraRawhide: mingw64-dbus
+
+ mingw64-dlfcn:
+ FedoraRawhide: mingw64-dlfcn
+
+ mingw64-gcc:
+ FedoraRawhide: mingw64-gcc
+
+ mingw64-gettext:
+ FedoraRawhide: mingw64-gettext
+
+ mingw64-gnutls:
+ FedoraRawhide: mingw64-gnutls
+
+ mingw64-libssh2:
+ FedoraRawhide: mingw64-libssh2
+
+ mingw64-libxml2:
+ FedoraRawhide: mingw64-libxml2
+
+ mingw64-openssl:
+ FedoraRawhide: mingw64-openssl
+
+ mingw64-pkg-config:
+ FedoraRawhide: mingw64-pkg-config
+
+ mingw64-portablexdr:
+ FedoraRawhide: mingw64-portablexdr
+
+ mingw64-readline:
+ FedoraRawhide: mingw64-readline
+
+ netcf:
+ deb: libnetcf-dev
+ rpm: netcf-devel
+
+ numad:
+ default: numad
+ FreeBSD:
+ Debian8:
+ Ubuntu12:
+ Ubuntu14:
+
+ openwsman:
+ rpm: libwsman-devel
+ Ubuntu: libopenwsman-dev
+
+ parted:
+ default: parted
+ FreeBSD:
+
patch:
default: patch
@@ -128,9 +365,44 @@ mappings:
rpm: pkgconfig
Ubuntu12: pkg-config
+ polkit:
+ deb: policykit-1
+ pkg: polkit
+ rpm: polkit-devel
+
+ qemu-img:
+ default: qemu-utils
+ rpm: qemu-img
+
+ radvd:
+ default: radvd
+
+ readline:
+ deb: libreadline-dev
+ pkg: readline
+ rpm: readline-devel
+
rpmbuild:
rpm: rpm-build
+ sanlock:
+ deb: libsanlock-dev
+ rpm: sanlock-devel
+ Ubuntu12:
+
+ scrub:
+ default: scrub
+ FreeBSD: diskscrub
+
+ sheepdog:
+ default: sheepdog
+ CentOS:
+ FreeBSD:
+
+ showmount:
+ deb: nfs-common
+ rpm: nfs-utils
+
usb-ids:
default: hwdata
FreeBSD: usbids
@@ -140,6 +412,30 @@ mappings:
deb: valac
CentOS6:
+ wireshark:
+ deb: wireshark-dev
+ Fedora: wireshark-devel
+ Debian8:
+ Ubuntu14:
+
+ xen:
+ deb: libxen-dev
+ Fedora: xen-devel
+
xmllint:
default: libxml2
deb: libxml2-utils
+
+ xsltproc:
+ default: libxslt
+ deb: xsltproc
+
+ yajl:
+ deb: libyajl-dev
+ pkg: yajl
+ rpm: yajl-devel
+
+ zfs:
+ default: zfs-fuse
+ CentOS:
+ FreeBSD:
diff --git a/ansible/vars/projects/libvirt.yml b/ansible/vars/projects/libvirt.yml
new file mode 100644
index 0000000..1c50499
--- /dev/null
+++ b/ansible/vars/projects/libvirt.yml
@@ -0,0 +1,78 @@
+---
+packages:
+ - apparmor
+ - augeas
+ - avahi
+ - cyrus-sasl
+ - device-mapper
+ - dnsmasq
+ - dtrace
+ - ebtables
+ - fuse
+ - glusterfs
+ - gnutls
+ - hal
+ - iscsiadm
+ - libacl
+ - libattr
+ - libaudit
+ - libblkid
+ - libcap-ng
+ - libcurl
+ - libdbus
+ - libnl
+ - libnl3
+ - libnlroute3
+ - libnuma
+ - libparted
+ - libpcap
+ - libpciaccess
+ - librbd
+ - libselinux
+ - libssh
+ - libssh2
+ - libudev
+ - libxml2
+ - lvm2
+ - mingw32-curl
+ - mingw32-dbus
+ - mingw32-dlfcn
+ - mingw32-gcc
+ - mingw32-gettext
+ - mingw32-gnutls
+ - mingw32-libssh2
+ - mingw32-libxml2
+ - mingw32-openssl
+ - mingw32-pkg-config
+ - mingw32-portablexdr
+ - mingw32-readline
+ - mingw64-curl
+ - mingw64-dbus
+ - mingw64-dlfcn
+ - mingw64-gcc
+ - mingw64-gettext
+ - mingw64-gnutls
+ - mingw64-libssh2
+ - mingw64-libxml2
+ - mingw64-openssl
+ - mingw64-pkg-config
+ - mingw64-portablexdr
+ - mingw64-readline
+ - netcf
+ - numad
+ - openwsman
+ - parted
+ - polkit
+ - qemu-img
+ - radvd
+ - readline
+ - sanlock
+ - scrub
+ - sheepdog
+ - showmount
+ - wireshark
+ - xen
+ - xmllint
+ - xsltproc
+ - yajl
+ - zfs
--
2.13.6
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
