libvirt: Enable low-hanging configure options

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: libvirt: Enable low-hanging configure options
From: Sijmen J. Mulder <sjmulder%NetBSD.org@localhost>
Date: Tue, 10 Aug 2021 18:16:24 +0000
Module Name:	pkgsrc-wip
Committed By:	Sijmen J. Mulder <sjmulder%NetBSD.org@localhost>
Pushed By:	sjmulder
Date:		Tue Aug 10 20:16:24 2021 +0200
Changeset:	e52ba470d2a28d07be7a9a3d0cb8ba99801b4394

Modified Files:
	libvirt/Makefile
	libvirt/PLIST
	libvirt/PLIST.Linux

Log Message:
libvirt: Enable low-hanging configure options

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e52ba470d2a28d07be7a9a3d0cb8ba99801b4394

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libvirt/Makefile    | 92 +++++++++++++++++++++++++++++++----------------------
 libvirt/PLIST       | 21 ++++++++++++
 libvirt/PLIST.Linux | 36 +++++++++++++++++++++
 3 files changed, 111 insertions(+), 38 deletions(-)

diffs:
diff --git a/libvirt/Makefile b/libvirt/Makefile
index 4371041c8f..ced3750eb9 100644
--- a/libvirt/Makefile
+++ b/libvirt/Makefile
@@ -45,78 +45,93 @@ CONF_FILES+=		${EGDIR}/logrotate.d/libvirtd.libxl ${PKG_SYSCONFDIR}/libvirtlogro
 CONF_FILES+=		${EGDIR}/logrotate.d/libvirtd.lxc ${PKG_SYSCONFDIR}/libvirtlogrotate.d/libvirtd.lxc
 CONF_FILES+=		${EGDIR}/logrotate.d/libvirtd.qemu ${PKG_SYSCONFDIR}/libvirtlogrotate.d/libvirtd.qemu
 
-CONFIGURE_ARGS+=	--with-libpcap=yes
-CONFIGURE_ARGS+=	--with-libxml=yes
-CONFIGURE_ARGS+=	--with-yajl=yes
-
-# 'check' is default, but here for reference
-#CONFIGURE_ARGS+=	--with-sysctl=check
-#CONFIGURE_ARGS+=	--with-init-script=check
+# Backends
+CONFIGURE_ARGS+=	--with-bhyve=check
+CONFIGURE_ARGS+=	--with-esx=no
+CONFIGURE_ARGS+=	--with-hyperv=no
+CONFIGURE_ARGS+=	--with-openvz=no	# Linux only
+CONFIGURE_ARGS+=	--with-qemu=yes
+CONFIGURE_ARGS+=	--with-vbox=yes
+CONFIGURE_ARGS+=	--with-vmware=yes
 
+# Libraries
 CONFIGURE_ARGS+=	--with-apparmor=no
 CONFIGURE_ARGS+=	--with-attr=no
-CONFIGURE_ARGS+=	--with-bash-completion=no
 CONFIGURE_ARGS+=	--with-blkid=no
 CONFIGURE_ARGS+=	--with-capng=no
 CONFIGURE_ARGS+=	--with-curl=no
 CONFIGURE_ARGS+=	--with-dbus=no
+CONFIGURE_ARGS+=	--with-dtrace=no
 CONFIGURE_ARGS+=	--with-firewalld=no
 CONFIGURE_ARGS+=	--with-fuse=no
 CONFIGURE_ARGS+=	--with-glusterfs=no
 CONFIGURE_ARGS+=	--with-hal=no
+CONFIGURE_ARGS+=	--with-interface=no
 CONFIGURE_ARGS+=	--with-libiscsi=no
+CONFIGURE_ARGS+=	--with-libpcap=yes
 CONFIGURE_ARGS+=	--with-libssh=no
-CONFIGURE_ARGS+=	--with-macvtap=no
+CONFIGURE_ARGS+=	--with-libxl=no
+CONFIGURE_ARGS+=	--with-libxml=yes
+CONFIGURE_ARGS+=	--with-lxc=no		# Linux only
+CONFIGURE_ARGS+=	--with-macvtap=no	# Linux only
 CONFIGURE_ARGS+=	--with-netcf=no
+# TODO: missing in Void w/ musl?
 CONFIGURE_ARGS+=	--with-nss-plugin=no
 CONFIGURE_ARGS+=	--with-numactl=no
+CONFIGURE_ARGS+=	--with-numad=no
 CONFIGURE_ARGS+=	--with-openwsman=no
 CONFIGURE_ARGS+=	--with-pciaccess=no
-CONFIGURE_ARGS+=	--with-pm-utils=no
+CONFIGURE_ARGS+=	--with-phyp=no
+CONFIGURE_ARGS+=	--with-pm-utils=yes
 CONFIGURE_ARGS+=	--with-polkit=no
+# TODO: yes with option readline
 CONFIGURE_ARGS+=	--with-readline=no
 CONFIGURE_ARGS+=	--with-sanlock=no
 CONFIGURE_ARGS+=	--with-sasl=no
-CONFIGURE_ARGS+=	--with-selinux=no
 CONFIGURE_ARGS+=	--with-selinux-mount=no
+CONFIGURE_ARGS+=	--with-selinux=no
 CONFIGURE_ARGS+=	--with-ssh2=no
 CONFIGURE_ARGS+=	--with-udev=no
-CONFIGURE_ARGS+=	--with-virtualport=no
-CONFIGURE_ARGS+=	--with-wireshark-dissector=no
-CONFIGURE_ARGS+=	--with-qemu=no
-CONFIGURE_ARGS+=	--with-openvz=no
-CONFIGURE_ARGS+=	--with-vmware=no
-CONFIGURE_ARGS+=	--with-phyp=no
-CONFIGURE_ARGS+=	--with-libxl=no
-CONFIGURE_ARGS+=	--with-vbox=no
-CONFIGURE_ARGS+=	--with-lxc=no
+CONFIGURE_ARGS+=	--with-virtualport=no	# Linux only
 CONFIGURE_ARGS+=	--with-vz=no
-CONFIGURE_ARGS+=	--with-bhyve=no
-CONFIGURE_ARGS+=	--with-esx=no
-CONFIGURE_ARGS+=	--with-hyperv=no
-CONFIGURE_ARGS+=	--with-interface=no
-CONFIGURE_ARGS+=	--with-dtrace=no
-CONFIGURE_ARGS+=	--with-numad=no
-CONFIGURE_ARGS+=	--with-login-shell=no
-CONFIGURE_ARGS+=	--with-host-validate=no
-CONFIGURE_ARGS+=	--with-secdriver-linux=no
-CONFIGURE_ARGS+=	--with-secdriver-apparmor=no
-CONFIGURE_ARGS+=	--with-apparmor-profiles=no
+CONFIGURE_ARGS+=	--with-yajl=yes
+
+# Storage
+CONFIGURE_ARGS+=	--with-storage-disk=no
+# TODO: breaks Void build. Needs mntent.h.
 CONFIGURE_ARGS+=	--with-storage-fs=no
-CONFIGURE_ARGS+=	--with-storage-lvm=no
-CONFIGURE_ARGS+=	--with-storage-iscsi=no
+CONFIGURE_ARGS+=	--with-storage-gluster=no
 CONFIGURE_ARGS+=	--with-storage-iscsi-direct=no
-CONFIGURE_ARGS+=	--with-storage-scsi=no
-CONFIGURE_ARGS+=	--with-storage-mpath=no
-CONFIGURE_ARGS+=	--with-storage-disk=no
+CONFIGURE_ARGS+=	--with-storage-iscsi=no
+CONFIGURE_ARGS+=	--with-storage-lvm=no	# Linux only
+CONFIGURE_ARGS+=	--with-storage-mpath=no	# Linux only
 CONFIGURE_ARGS+=	--with-storage-rbd=no
+CONFIGURE_ARGS+=	--with-storage-scsi=yes
 CONFIGURE_ARGS+=	--with-storage-sheepdog=no
-CONFIGURE_ARGS+=	--with-storage-gluster=no
-CONFIGURE_ARGS+=	--with-storage-zfs=no
 CONFIGURE_ARGS+=	--with-storage-vstorage=no
+CONFIGURE_ARGS+=	--with-storage-zfs=no
+
+# Security drivers
+CONFIGURE_ARGS+=	--with-secdriver-linux=no
+CONFIGURE_ARGS+=	--with-secdriver-apparmor=no
+
+# Misc
+# TODO: yes with option readline
+CONFIGURE_ARGS+=	--with-bash-completion=no
+CONFIGURE_ARGS+=	--with-host-validate=yes
+CONFIGURE_ARGS+=	--with-init-script=check
+CONFIGURE_ARGS+=	--with-login-shell=no	# Linux only
+CONFIGURE_ARGS+=	--with-sysctl=check
+CONFIGURE_ARGS+=	--with-wireshark-dissector=no
 
 CONFIGURE_ARGS.NetBSD+=	--with-qemu-group=wheel
 
+CONFIGURE_ARGS.Linux+=	--with-lxc=yes
+CONFIGURE_ARGS.Linux+=	--with-macvtap=yes
+CONFIGURE_ARGS.Linux+=	--with-virtualport=yes
+CONFIGURE_ARGS.Linux+=	--with-login-shell=yes
+CONFIGURE_ARGS.Linux+=	--with-storage-lvm=yes
+CONFIGURE_ARGS.Linux+=	--with-storage-mpath=yes
 # Unit files for all distros, harmless for other inits.
 CONFIGURE_ARGS.Linux+=	--with-init-script=systemd
 
@@ -124,6 +139,7 @@ CONFIGURE_ARGS.Linux+=	--with-init-script=systemd
 
 .if ${OPSYS} == "Linux"
 .include "../../wip/libnl1/buildlink3.mk"
+.include "../../wip/lvm2/buildlink3.mk"
 .include "../../wip/portablexdr/buildlink3.mk"
 .endif
 
diff --git a/libvirt/PLIST b/libvirt/PLIST
index fb1ff3140a..d222bc7791 100644
--- a/libvirt/PLIST
+++ b/libvirt/PLIST
@@ -1,6 +1,7 @@
 @comment $NetBSD$
 bin/virsh
 bin/virt-admin
+bin/virt-host-validate
 bin/virt-pki-validate
 bin/virt-xml-validate
 include/libvirt/libvirt-admin.h
@@ -26,8 +27,14 @@ lib/libvirt-lxc.la
 lib/libvirt-qemu.la
 lib/libvirt.la
 lib/libvirt/connection-driver/libvirt_driver_network.la
+lib/libvirt/connection-driver/libvirt_driver_qemu.a
+lib/libvirt/connection-driver/libvirt_driver_qemu.la
+lib/libvirt/connection-driver/libvirt_driver_qemu.so
 lib/libvirt/connection-driver/libvirt_driver_secret.la
 lib/libvirt/connection-driver/libvirt_driver_storage.la
+lib/libvirt/connection-driver/libvirt_driver_vbox.a
+lib/libvirt/connection-driver/libvirt_driver_vbox.la
+lib/libvirt/connection-driver/libvirt_driver_vbox.so
 lib/libvirt/lock-driver/lockd.la
 lib/libvirt/storage-backend/libvirt_storage_backend_fs.la
 lib/libvirt/storage-file/libvirt_storage_file_fs.la
@@ -40,6 +47,7 @@ libexec/libvirt_iohelper
 libexec/libvirt_leaseshelper
 man/man1/virsh.1
 man/man1/virt-admin.1
+man/man1/virt-host-validate.1
 man/man1/virt-pki-validate.1
 man/man1/virt-xml-validate.1
 man/man7/virkeycode-atset1.7
@@ -62,23 +70,32 @@ sbin/virtlockd
 sbin/virtlogd
 sbin/virtnetworkd
 sbin/virtproxyd
+sbin/virtqemud
 sbin/virtsecretd
 sbin/virtstoraged
+sbin/virtvboxd
 share/augeas/lenses/libvirt_lockd.aug
 share/augeas/lenses/libvirtd.aug
+share/augeas/lenses/libvirtd_qemu.aug
+share/augeas/lenses/tests/test_libvirt_lockd.aug
 share/augeas/lenses/tests/test_libvirtd.aug
+share/augeas/lenses/tests/test_libvirtd_qemu.aug
 share/augeas/lenses/tests/test_virtlockd.aug
 share/augeas/lenses/tests/test_virtlogd.aug
 share/augeas/lenses/tests/test_virtnetworkd.aug
 share/augeas/lenses/tests/test_virtproxyd.aug
+share/augeas/lenses/tests/test_virtqemud.aug
 share/augeas/lenses/tests/test_virtsecretd.aug
 share/augeas/lenses/tests/test_virtstoraged.aug
+share/augeas/lenses/tests/test_virtvboxd.aug
 share/augeas/lenses/virtlockd.aug
 share/augeas/lenses/virtlogd.aug
 share/augeas/lenses/virtnetworkd.aug
 share/augeas/lenses/virtproxyd.aug
+share/augeas/lenses/virtqemud.aug
 share/augeas/lenses/virtsecretd.aug
 share/augeas/lenses/virtstoraged.aug
+share/augeas/lenses/virtvboxd.aug
 share/doc/libvirt/examples/c/admin/client_close.c
 share/doc/libvirt/examples/c/admin/client_info.c
 share/doc/libvirt/examples/c/admin/client_limits.c
@@ -288,14 +305,18 @@ share/doc/libvirt/html/windows.html
 share/examples/libvirt/libvirt-admin.conf
 share/examples/libvirt/libvirt.conf
 share/examples/libvirt/libvirtd.conf
+share/examples/libvirt/qemu-lockd.conf
+share/examples/libvirt/qemu.conf
 share/examples/libvirt/qemu/networks/autostart/default.xml
 share/examples/libvirt/qemu/networks/default.xml
 share/examples/libvirt/virtlockd.conf
 share/examples/libvirt/virtlogd.conf
 share/examples/libvirt/virtnetworkd.conf
 share/examples/libvirt/virtproxyd.conf
+share/examples/libvirt/virtqemud.conf
 share/examples/libvirt/virtsecretd.conf
 share/examples/libvirt/virtstoraged.conf
+share/examples/libvirt/virtvboxd.conf
 share/examples/logrotate.d/libvirtd
 share/examples/logrotate.d/libvirtd.libxl
 share/examples/logrotate.d/libvirtd.lxc
diff --git a/libvirt/PLIST.Linux b/libvirt/PLIST.Linux
index 4645f981d5..4701a2dc59 100644
--- a/libvirt/PLIST.Linux
+++ b/libvirt/PLIST.Linux
@@ -1,5 +1,20 @@
 @comment $NetBSD$
+bin/virt-login-shell
+libexec/libvirt_lxc
+libexec/virt-login-shell-helper
+lib/libvirt/connection-driver/libvirt_driver_lxc.a
+lib/libvirt/connection-driver/libvirt_driver_lxc.la
+lib/libvirt/connection-driver/libvirt_driver_lxc.so
 lib/libvirt/connection-driver/libvirt_driver_nwfilter.la
+lib/libvirt/storage-backend/libvirt_storage_backend_logical.a
+lib/libvirt/storage-backend/libvirt_storage_backend_logical.la
+lib/libvirt/storage-backend/libvirt_storage_backend_logical.so
+lib/libvirt/storage-backend/libvirt_storage_backend_mpath.a
+lib/libvirt/storage-backend/libvirt_storage_backend_mpath.la
+lib/libvirt/storage-backend/libvirt_storage_backend_mpath.so
+lib/libvirt/storage-backend/libvirt_storage_backend_scsi.a
+lib/libvirt/storage-backend/libvirt_storage_backend_scsi.la
+lib/libvirt/storage-backend/libvirt_storage_backend_scsi.so
 lib/sysctl.d/60-libvirtd.conf
 lib/systemd/system/libvirtd-admin.socket
 lib/systemd/system/libvirtd-ro.socket
@@ -15,6 +30,10 @@ lib/systemd/system/virtlockd.socket
 lib/systemd/system/virtlogd-admin.socket
 lib/systemd/system/virtlogd.service
 lib/systemd/system/virtlogd.socket
+lib/systemd/system/virtlxcd-admin.socket
+lib/systemd/system/virtlxcd-ro.socket
+lib/systemd/system/virtlxcd.service
+lib/systemd/system/virtlxcd.socket
 lib/systemd/system/virtnetworkd-admin.socket
 lib/systemd/system/virtnetworkd-ro.socket
 lib/systemd/system/virtnetworkd.service
@@ -29,6 +48,10 @@ lib/systemd/system/virtproxyd.service
 lib/systemd/system/virtproxyd.socket
 lib/systemd/system/virtproxyd-tcp.socket
 lib/systemd/system/virtproxyd-tls.socket
+lib/systemd/system/virtqemud-admin.socket
+lib/systemd/system/virtqemud-ro.socket
+lib/systemd/system/virtqemud.service
+lib/systemd/system/virtqemud.socket
 lib/systemd/system/virtsecretd-admin.socket
 lib/systemd/system/virtsecretd-ro.socket
 lib/systemd/system/virtsecretd.service
@@ -37,9 +60,20 @@ lib/systemd/system/virtstoraged-admin.socket
 lib/systemd/system/virtstoraged-ro.socket
 lib/systemd/system/virtstoraged.service
 lib/systemd/system/virtstoraged.socket
+lib/systemd/system/virtvboxd-admin.socket
+lib/systemd/system/virtvboxd-ro.socket
+lib/systemd/system/virtvboxd.service
+lib/systemd/system/virtvboxd.socket
+man/man1/virt-login-shell.1
+sbin/virtlxcd
 sbin/virtnwfilterd
+share/augeas/lenses/libvirtd_lxc.aug
+share/augeas/lenses/tests/test_libvirtd_lxc.aug
+share/augeas/lenses/tests/test_virtlxcd.aug
 share/augeas/lenses/tests/test_virtnwfilterd.aug
+share/augeas/lenses/virtlxcd.aug
 share/augeas/lenses/virtnwfilterd.aug
+share/examples/libvirt/lxc.conf
 share/examples/libvirt/nwfilter/allow-arp.xml
 share/examples/libvirt/nwfilter/allow-dhcp-server.xml
 share/examples/libvirt/nwfilter/allow-dhcp.xml
@@ -58,6 +92,8 @@ share/examples/libvirt/nwfilter/no-other-l2-traffic.xml
 share/examples/libvirt/nwfilter/no-other-rarp-traffic.xml
 share/examples/libvirt/nwfilter/qemu-announce-self-rarp.xml
 share/examples/libvirt/nwfilter/qemu-announce-self.xml
+share/examples/libvirt/virt-login-shell.conf
+share/examples/libvirt/virtlxcd.conf
 share/examples/libvirt/virtnwfilterd.conf
 share/examples/sysconfig/libvirtd
 share/examples/sysconfig/libvirt-guests
Prev by Date: libvirt: Fixes for pkglint
Next by Date: libvirt: Disable pcap
Previous by Thread: libvirt: Fixes for pkglint
Next by Thread: libvirt: Disable pcap
Indexes:
Home | Main Index | Thread Index | Old Index