commit 40a24f8b2d50b2f96cee9aa61d0e4c77278dac36
Author: Jakub Bogusz <[email protected]>
Date: Thu Jun 16 07:43:40 2022 +0200
- updated to 6.10.0
- removed outdated bash-completions-dir,fix-docs-css patches
- added paths patch (adjust systemd units and sasl config dirs)
- added path-options patch (add meson options to specify util/daemon paths
to avoid buildrequiring dozens of daemons etc.)
fix-docs-css.patch | 23 ---
libvirt-bash-completions-dir.patch | 24 ---
libvirt-path-options.patch | 386 +++++++++++++++++++++++++++++++++++++
libvirt-paths.patch | 33 ++++
libvirt.spec | 241 ++++++++++-------------
5 files changed, 524 insertions(+), 183 deletions(-)
---
diff --git a/libvirt.spec b/libvirt.spec
index aa55063..0932704 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -1,6 +1,7 @@
# TODO:
# - parallels-sdk >= 7.0.22?
# - virtuozzo storage?
+# - mdevctl
# - mm-ctl (https://github.com/tfukushima/mm-ctl ?)
# - numad (https://pagure.io/numad/ or
https://github.com/yhaenggi/numad/releases ?)
# - vstorage, vstorage-mount
@@ -44,22 +45,22 @@
Summary: Toolkit to interact with virtualization capabilities
Summary(pl.UTF-8): Narzędzia współpracujące z funkcjami wirtualizacji
Name: libvirt
-Version: 6.6.0
-Release: 4
+Version: 6.10.0
+Release: 1
License: LGPL v2.1+
Group: Libraries
Source0: https://libvirt.org/sources/libvirt-%{version}.tar.xz
-# Source0-md5: a1f1d1580292f8932bcbacf5801cf223
+# Source0-md5: 43037045ef94c8600d4289b49ec73a77
Source1: %{name}.init
Source2: %{name}.tmpfiles
Patch0: %{name}-sasl.patch
-Patch1: %{name}-bash-completions-dir.patch
+Patch1: %{name}-paths.patch
Patch2: %{name}-qemu-acl.patch
+Patch3: %{name}-path-options.patch
Patch4: %{name}-udevadm-settle.patch
Patch5: vserver.patch
Patch6: bashisms.patch
Patch7: fix-docs-templates.patch
-Patch8: fix-docs-css.patch
URL: https://www.libvirt.org/
BuildRequires: acl-devel
BuildRequires: attr-devel
@@ -91,6 +92,7 @@ BuildRequires: libpcap-devel >= 1.5.0
BuildRequires: libselinux-devel >= 2.5
BuildRequires: libssh-devel >= 0.7
BuildRequires: libssh2-devel >= 1.3
+BuildRequires: libtirpc-devel
BuildRequires: libtool
BuildRequires: libxml2-devel >= 1:2.9.1
BuildRequires: libxml2-progs >= 1:2.9.1
@@ -98,20 +100,22 @@ BuildRequires: libxslt-devel
BuildRequires: libxslt-progs
BuildRequires: ncurses-devel
%{?with_netcf:BuildRequires: netcf-devel >= 0.2.0}
-BuildRequires: numactl-devel
-%{?with_hyperv:BuildRequires: openwsman-devel >= 2.2.3}
+BuildRequires: nss-devel >= 3
+BuildRequires: numactl-devel >= 2.0.6
+%{?with_hyperv:BuildRequires: openwsman-devel >= 2.6.3}
BuildRequires: parted-devel >= 1.8.0
BuildRequires: pkgconfig
%{?with_polkit:BuildRequires: polkit}
%{?with_polkit:BuildRequires: polkit-devel >= 0.90}
BuildRequires: python3 >= 1:3.0
-BuildRequires: readline-devel
+BuildRequires: readline-devel >= 7.0
BuildRequires: rpmbuild(macros) >= 1.752
-%{?with_sanlock:BuildRequires: sanlock-devel >= 0.8}
+%{?with_sanlock:BuildRequires: sanlock-devel >= 3.5.0}
+BuildRequires: sed >= 4.0
BuildRequires: systemd-devel
%{?with_systemtap:BuildRequires: systemtap-sdt-devel}
BuildRequires: udev-devel >= 1:219
-%{?with_wireshark:BuildRequires: wireshark-devel >= 2.4.0}
+%{?with_wireshark:BuildRequires: wireshark-devel >= 2.6.0}
%{?with_libxl:BuildRequires: xen-devel >= 4.6}
# For disk driver
BuildRequires: xorg-lib-libpciaccess-devel >= 0.10.0
@@ -128,14 +132,14 @@ Requires: libselinux >= 2.5
Requires: libssh >= 0.7
Requires: libssh2 >= 1.3
Requires: libxml2 >= 1:2.9.1
-%{?with_hyperv:Requires: openwsman-libs >= 2.2.3}
+%{?with_hyperv:Requires: openwsman-libs >= 2.6.3}
Requires: yajl >= 2.0.3
-Obsoletes: libvirt-daemon-esx
-Obsoletes: libvirt-daemon-hyperv
-Obsoletes: libvirt-daemon-openvz
+Obsoletes: libvirt-daemon-esx < 0.9.13
+Obsoletes: libvirt-daemon-hyperv < 0.9.13
+Obsoletes: libvirt-daemon-openvz < 0.9.13
Obsoletes: libvirt-daemon-phyp < 6.0.0
Obsoletes: libvirt-daemon-uml < 5.0.0
-Obsoletes: libvirt-daemon-vmware
+Obsoletes: libvirt-daemon-vmware < 0.9.13
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -235,6 +239,7 @@ Summary: Sanlock lock manager plugin for libvirt
Summary(pl.UTF-8): Zarządca blokad sanlock dla biblioteki libvirt
Group: Libraries
Requires: %{name}-daemon = %{version}-%{release}
+Requires: sanlock-libs >= 3.5.0
%description lock-sanlock
Sanlock lock manager plugin for libvirt.
@@ -455,7 +460,7 @@ Sondy systemtap/dtrace dla libvirt.
Summary: Wireshark dissector module for libvirt packets
Summary(pl.UTF-8): Moduł sekcji Wiresharka do pakietów libvirt
Group: Libraries
-Requires: wireshark >= 2.4.0
+Requires: wireshark >= 2.6.0
%description -n wireshark-libvirt
Wireshark dissector module for libvirt packets.
@@ -468,141 +473,103 @@ Moduł sekcji Wiresharka do pakietów libvirt.
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%patch4 -p1
%{?with_vserver:%patch5 -p1}
%patch6 -p1
%patch7 -p1
-%patch8 -p1
+
+%if %{with static_libs}
+%{__sed} -i '/^libvirt\(_admin\|_lxc\|_qemu\)\?_lib = /
s/shared_library/library/' src/meson.build
+%endif
%build
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-install -d build
-cd build
-../%configure \
- PVCREATE=/sbin/pvcreate \
- VGCREATE=/sbin/vgcreate \
- LVCREATE=/sbin/lvcreate \
- PVREMOVE=/sbin/pvremove \
- VGREMOVE=/sbin/vgremove \
- LVREMOVE=/sbin/lvremove \
- LVCHANGE=/sbin/lvchange \
- VGCHANGE=/sbin/vgchange \
- VGSCAN=/sbin/vgscan \
- PVS=/sbin/pvs \
- VGS=/sbin/vgs \
- LVS=/sbin/lvs \
- TC=/sbin/tc \
- BRCTL=/sbin/brctl \
- AUGPARSE=/usr/bin/augparse \
- ISCSIADM=/sbin/iscsiadm \
- SHOWMOUNT=/usr/sbin/showmount \
- MOUNT=/bin/mount \
- UMOUNT=/bin/umount \
- MKFS=/sbin/mkfs \
- SHOWMOUNT=/usr/sbin/showmount \
- IP_PATH=/sbin/ip \
- IPTABLES_PATH=/usr/sbin/iptables \
- IP6TABLES_PATH=/usr/sbin/ip6tables \
- EBTABLES_PATH=/usr/sbin/ebtables \
- ISCSIADM=/sbin/iscsiadm \
- DMIDECODE=/usr/sbin/dmidecode \
- DNSMASQ=/usr/sbin/dnsmasq \
- RADVD=/usr/sbin/radvd \
- UDEVADM=/sbin/udevadm \
- MODPROBE=/sbin/modprobe \
- RMMOD=/sbin/rmmod \
- MMCTL=/usr/sbin/mm-ctl \
- OVSVSCTL=/usr/bin/ovs-vsctl \
- SCRUB=/usr/bin/scrub \
- NUMAD=/usr/bin/numad \
- QEMU_BRIDGE_HELPER=%{_libexecdir}/qemu-bridge-helper \
- QEMU_PR_HELPER=/usr/bin/qemu-pr-helper \
- SHEEPDOGCLI=/usr/sbin/collie \
- ZFS=/usr/sbin/zfs \
- ZPOOL=/usr/sbin/zpool \
- --disable-silent-rules \
- %{?with_static_libs:--enable-static} \
- --with-bash-completion \
- --with-bash-completions-dir=%{bash_compdir} \
- --with-init-script=systemd \
- --with-packager="PLD-Linux" \
- --with-packager-version="%{name}-%{version}-%{release}.%{_target_cpu}" \
- --with-qemu-user=qemu \
- --with-qemu-group=qemu \
- --with-storage-disk \
- --with-storage-fs \
- --with-storage-gluster%{!?with_glusterfs:=no} \
- --with-storage-iscsi \
- --with-storage-lvm \
- --with-storage-mpath \
- --with-storage-rbd%{!?with_ceph:=no} \
- --with-storage-scsi \
- --with-storage-sheepdog \
- --with-apparmor \
- --with-audit \
- %{__with_without systemtap dtrace} \
- %{__with_without esx} \
- --with-driver-modules \
- --without-hal \
- %{__with_without hyperv} \
- --with-blkid \
- --with-ssh2 \
- %{__with_without libxl} \
- %{__with_without lxc} \
- --with-macvtap \
- %{__with_without netcf} \
- --with-numactl \
- --with-numad \
- %{__with_without openvz} \
- %{__with_without polkit} \
- %{__with_without qemu} \
- %{__with_without sanlock} \
- --with-sasl \
- --with-selinux \
- --with-udev \
- %{__with_without vbox vbox %{_libdir}/VirtualBox} \
- --with-virtualport \
- %{__with_without vmware} \
- %{!?with_wireshark:--without-wireshark-dissector} \
- --x-libraries=%{_libdir}
-
-%{__make} \
- AWK=gawk
+%meson build \
+ -Dbash_completion=enabled \
+ -Dbash_completion_dir=%{bash_compdir} \
+ %{!?with_esx:-Ddriver_esx=disabled} \
+ %{!?with_hyperv:-Ddriver_hyperv=disabled} \
+ %{!?with_libxl:-Ddriver_libxl=disabled} \
+ %{!?with_lxc:-Ddriver_lxc=disabled} \
+ %{!?with_openvz:-Ddriver_openvz=disabled} \
+ %{!?with_qemu:-Ddriver_qemu=disabled} \
+ %{!?with_vbox:-Ddriver_vbox=disabled} \
+ %{!?with_vmware:-Ddriver_vmware=disabled} \
+ %{!?with_systemtap:-Ddtrace=disabled} \
+ %{!?with_glusterfs:-Dglusterfs=disabled} \
+ -Dinit_script=systemd \
+ %{!?with_netcf:-Dnetcf=disabled} \
+ -Dpackager="PLD-Linux" \
+ -Dpackager_version="%{name}-%{version}-%{release}.%{_target_cpu}" \
+ %{!?with_polkit:-Dpolkit=disabled} \
+ -Dqemu_group=qemu \
+ -Dqemu_user=qemu \
+ -Drpath=disabled \
+ %{!?with_sanlock:-Dsanlock=disabled} \
+ %{!?with_glusterfs:-Dstorage_gluster=disabled} \
+ %{!?with_ceph:-Dstorage_rbd=disabled} \
+ %{?with_vbox:-Dvbox_xpcomc_dir=%{_libdir}/VirtualBox} \
+ %{!?with_wireshark:-Dwireshark_dissector=disabled} \
+ -Daugparse_path=/usr/bin/augparse \
+ -Ddmidecode_path=/usr/sbin/dmidecode \
+ -Ddnsmasq_path=/usr/sbin/dnsmasq \
+ -Debtables_path=/usr/sbin/ebtables \
+ -Dip_path=/sbin/ip \
+ -Dip6tables_path=/usr/sbin/ip6tables \
+ -Diptables_path=/usr/sbin/iptables \
+ -Discsiadm_path=/sbin/iscsiadm \
+ -Dlvchange_path=/sbin/lvchange \
+ -Dlvcreate_path=/sbin/lvcreate \
+ -Dlvremove_path=/sbin/lvremove \
+ -Dlvs_path=/sbin/lvs \
+ -Dmm_ctl_path=/usr/sbin/mm-ctl \
+ -Dmkfs_path=/sbin/mkfs \
+ -Dmodprobe_path=/sbin/modprobe \
+ -Dmount_path=/bin/mount \
+ -Dnumad_path=/usr/bin/numad \
+ -Dovs_vsctl_path=/usr/bin/ovs-vsctl \
+ -Dparted_path=/usr/sbin/parted \
+ -Dpvcreate_path=/sbin/pvcreate \
+ -Dpvremove_path=/sbin/pvremove \
+ -Dpvs_path=/sbin/pvs \
+ -Dqemu_bridge_path=%{_libexecdir}/qemu-bridge-helper \
+ -Dqemu_dbus_daemon_path=/usr/bin/dbus-daemon \
+ -Dqemu_pr_path=/usr/bin/qemu-pr-helper \
+ -Dradvd_path=/usr/sbin/radvd \
+ -Drmmod_path=/sbin/rmmod \
+ -Dscrub_path=/usr/bin/scrub \
+ -Dsheepdogcli_path=/usr/sbin/collie \
+ -Dshowmount_path=/usr/sbin/showmount \
+ -Dtc_path=/sbin/tc \
+ -Dudevadm_path=/sbin/udevadm \
+ -Dumount_path=/bin/umount \
+ -Dvgchange_path=/sbin/vgchange \
+ -Dvgcreate_path=/sbin/vgcreate \
+ -Dvgremove_path=/sbin/vgremove \
+ -Dvgscan_path=/sbin/vgscan \
+ -Dvgs_path=/sbin/vgs \
+ -Dzfs_path=/usr/sbin/zfs \
+ -Dzpool_path=/usr/sbin/zpool
+
+# TODO: package and update paths
+# -Dmdevctl_path=???
+# -Dpdwtags=???
+# -Dqemu_slirp_path=???/slirp-helper
+# -Dvstorage_path=???/vstorage
+# -Dvstorage_mount_path=???/vstorage-mount
+
+%ninja_build -C build
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d} \
$RPM_BUILD_ROOT%{systemdtmpfilesdir}
-%{__make} -C build install \
- SYSTEMD_UNIT_DIR=%{systemdunitdir} \
- sasldir=%{_sysconfdir}/sasl \
- DESTDIR=$RPM_BUILD_ROOT
+%ninja_install -C build
install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/libvirtd
cp -p %{SOURCE2} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.la \
-
%{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.a}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/storage-backend/*.la \
-
%{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/libvirt/storage-backend/*.a}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/storage-file/*.la \
- %{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/libvirt/storage-file/*.a}
-
-%if %{with sanlock}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvirt/lock-driver/*.la \
- %{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/libvirt/lock-driver/*.a}
-%endif
-%if %{with wireshark}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/epan/libvirt.la \
-
%{?with_static_libs:$RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/epan/libvirt.a}
\
-%endif
-
%find_lang %{name}
%clean
@@ -644,7 +611,7 @@ fi
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS.rst README.rst
+%doc AUTHORS.rst NEWS.rst README.rst
%dir %{_sysconfdir}/libvirt
%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/libvirt/libvirt.conf
%attr(755,root,root) %{_libdir}/libvirt.so.*.*.*
@@ -987,6 +954,7 @@ fi
%attr(4755,root,root) %{_bindir}/virt-login-shell
%attr(755,root,root) %{_bindir}/virt-xml-validate
%attr(755,root,root) %{_bindir}/virt-pki-validate
+%attr(755,root,root) %{_bindir}/virt-ssh-helper
%attr(754,root,root) %{_libexecdir}/libvirt-guests.sh
%attr(754,root,root) %{_libexecdir}/virt-login-shell-helper
%{_mandir}/man1/virsh.1*
@@ -998,6 +966,7 @@ fi
%dir %{_datadir}/libvirt/schemas
%{_datadir}/libvirt/schemas/basictypes.rng
%{_datadir}/libvirt/schemas/capability.rng
+%{_datadir}/libvirt/schemas/cpu.rng
%{_datadir}/libvirt/schemas/cputypes.rng
%{_datadir}/libvirt/schemas/domain.rng
%{_datadir}/libvirt/schemas/domainbackup.rng
diff --git a/fix-docs-css.patch b/fix-docs-css.patch
deleted file mode 100644
index 3b3610a..0000000
--- a/fix-docs-css.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- libvirt-6.6.0/docs/Makefile.am~ 2020-07-21 15:34:44.000000000 +0200
-+++ libvirt-6.6.0/docs/Makefile.am 2022-06-12 10:36:19.495506442 +0200
-@@ -411,17 +411,17 @@
- grep -v '^:Manual ' < $< | \
- sed -e 's|SYSCONFDIR|$(sysconfdir)|g' \
- -e 's|RUNSTATEDIR|$(runstatedir)|g' | \
-- $(RST2HTML) --strict > $@ || { rm $@ && exit 1; }
-+ $(RST2HTML) --stylesheet-path=minimal.css,responsive.css --strict >
$@ || { rm $@ && exit 1; }
-
- news.html.in: $(top_srcdir)/NEWS.rst
- $(AM_V_GEN)$(MKDIR_P) `dirname $@` && \
-- $(RST2HTML) --strict $< > $@ || { rm $@ && exit 1; }
-+ $(RST2HTML) --stylesheet-path=minimal.css,responsive.css --strict $<
> $@ || { rm $@ && exit 1; }
-
- CLEANFILES += news.html.in
-
- %.html.in: %.rst
- $(AM_V_GEN)$(MKDIR_P) `dirname $@` && \
-- $(RST2HTML) --strict $< > $@ || { rm $@ && exit 1; }
-+ $(RST2HTML) --stylesheet-path=minimal.css,responsive.css --strict $<
> $@ || { rm $@ && exit 1; }
-
- %.html.tmp: %.html.in site.xsl subsite.xsl page.xsl \
- $(acl_generated)
diff --git a/libvirt-bash-completions-dir.patch
b/libvirt-bash-completions-dir.patch
deleted file mode 100644
index 47af4d9..0000000
--- a/libvirt-bash-completions-dir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- libvirt-6.4.0/m4/virt-bash-completion.m4.orig 2019-11-26
22:17:34.576588169 +0100
-+++ libvirt-6.4.0/m4/virt-bash-completion.m4 2020-06-21 11:00:05.173640478
+0200
-@@ -37,11 +37,12 @@
- fi
- fi
-
-- LIBVIRT_CHECK_PKG([BASH_COMPLETION], [bash-completion], [2.0])
-+ AM_CONDITIONAL([WITH_BASH_COMPLETION], [false])
-
- if test "x$with_bash_completion" = "xyes" ; then
- if test "x$with_bash_completions_dir" = "xcheck"; then
- AC_MSG_CHECKING([for bash-completions directory])
-+ LIBVIRT_CHECK_PKG([BASH_COMPLETION], [bash-completion], [2.0])
- BASH_COMPLETIONS_DIR="$($PKG_CONFIG --variable=completionsdir
bash-completion)"
- AC_MSG_RESULT([$BASH_COMPLETIONS_DIR])
-
-@@ -59,6 +60,7 @@
- AC_MSG_ERROR([bash-completions-dir must be used only with valid path])
- else
- BASH_COMPLETIONS_DIR=$with_bash_completions_dir
-+ AM_CONDITIONAL([WITH_BASH_COMPLETION], [true])
- fi
- AC_SUBST([BASH_COMPLETIONS_DIR])
- fi
diff --git a/libvirt-path-options.patch b/libvirt-path-options.patch
new file mode 100644
index 0000000..8f79523
--- /dev/null
+++ b/libvirt-path-options.patch
@@ -0,0 +1,386 @@
+--- libvirt-6.10.0/meson.build.orig 2020-12-01 09:51:29.000000000 +0100
++++ libvirt-6.10.0/meson.build 2022-06-15 21:02:52.949418900 +0200
+@@ -943,17 +943,20 @@ optional_programs = [
+ ]
+
+ foreach name : optional_programs
++ varname = name.underscorify()
++ prog_path = get_option('@0@_path'.format(varname))
++ if prog_path == ''
+ prog = find_program(name, required: false, dirs: libvirt_sbin_path)
+- varname = name.underscorify()
+ if prog.found()
+ prog_path = prog.path()
+ else
+ prog_path = name
+ endif
++ endif
+
+ conf.set_quoted(varname.to_upper(), prog_path)
+ conf.set_quoted('@0@_PATH'.format(varname.to_upper()), prog_path)
+- set_variable('@0@_prog'.format(varname), prog)
++ set_variable('@0@_path'.format(varname), prog_path)
+ endforeach
+
+
+@@ -1085,9 +1088,15 @@ endif
+ libparted_version = '1.8.0'
+ libparted_dep = dependency('libparted', version: '>=' + libparted_version,
required: false)
+ if libparted_dep.found()
++ parted_path = get_option('parted_path')
++ if parted_path == ''
+ parted_prog = find_program('parted', required: false, dirs:
libvirt_sbin_path)
+ if parted_prog.found()
+- conf.set_quoted('PARTED', parted_prog.path())
++ parted_path = parted_prog.path()
++ endif
++ endif
++ if parted_path != ''
++ conf.set_quoted('PARTED', parted_path)
+ else
+ libparted_dep = dependency('', required: false)
+ endif
+@@ -1725,6 +1734,8 @@ if not get_option('driver_qemu').disable
+ conf.set_quoted('QEMU_USER', qemu_user)
+ conf.set_quoted('QEMU_GROUP', qemu_group)
+
++ qemu_bridge_path = get_option('qemu_bridge_path')
++ if qemu_bridge_path == ''
+ qemu_bridge_prog = find_program(
+ 'qemu-bridge-helper',
+ dirs: [ '/usr/libexec', '/usr/lib/qemu', '/usr/lib' ],
+@@ -1735,8 +1746,11 @@ if not get_option('driver_qemu').disable
+ else
+ qemu_bridge_path = '/usr/libexec/qemu-bridge-helper'
+ endif
++ endif
+ conf.set_quoted('QEMU_BRIDGE_HELPER', qemu_bridge_path)
+
++ qemu_pr_path = get_option('qemu_pr_path')
++ if qemu_pr_path == ''
+ qemu_pr_prog = find_program(
+ 'qemu-pr-helper',
+ dirs: [ '/usr/bin', '/usr/libexec' ],
+@@ -1747,8 +1761,11 @@ if not get_option('driver_qemu').disable
+ else
+ qemu_pr_path = '/usr/bin/qemu-pr-helper'
+ endif
++ endif
+ conf.set_quoted('QEMU_PR_HELPER', qemu_pr_path)
+
++ qemu_slirp_path = get_option('qemu_slirp_path')
++ if qemu_slirp_path == ''
+ qemu_slirp_prog = find_program(
+ 'slirp-helper',
+ dirs: [ '/usr/bin', '/usr/libexec' ],
+@@ -1759,8 +1776,11 @@ if not get_option('driver_qemu').disable
+ else
+ qemu_slirp_path = '/usr/bin/slirp-helper'
+ endif
++ endif
+ conf.set_quoted('QEMU_SLIRP_HELPER', qemu_slirp_path)
+
++ qemu_dbus_daemon_path = get_option('qemu_dbus_daemon_path')
++ if qemu_dbus_daemon_path == ''
+ qemu_dbus_daemon_prog = find_program(
+ 'dbus-daemon',
+ dirs: [ '/usr/bin', '/usr/libexec' ],
+@@ -1771,6 +1791,7 @@ if not get_option('driver_qemu').disable
+ else
+ qemu_dbus_daemon_path = '/usr/bin/dbus-daemon'
+ endif
++ endif
+ conf.set_quoted('QEMU_DBUS_DAEMON', qemu_dbus_daemon_path)
+ endif
+ endif
+@@ -1850,11 +1871,29 @@ if conf.has('WITH_LIBVIRTD')
+ endif
+
+ if fs_enable
++ mount_path = get_option('mount_path')
++ if mount_path == ''
+ mount_prog = find_program('mount', required: get_option('storage_fs'),
dirs: libvirt_sbin_path)
++ if mount_prog.found()
++ mount_path = mount_prog.path()
++ endif
++ endif
++ umount_path = get_option('umount_path')
++ if umount_path == ''
+ umount_prog = find_program('umount', required:
get_option('storage_fs'), dirs: libvirt_sbin_path)
++ if umount_prog.found()
++ umount_path = umount_prog.path()
++ endif
++ endif
++ mkfs_path = get_option('mkfs_path')
++ if mkfs_path == ''
+ mkfs_prog = find_program('mkfs', required: get_option('storage_fs'),
dirs: libvirt_sbin_path)
++ if mkfs_prog.found()
++ mkfs_path = mkfs_prog.path()
++ endif
++ endif
+
+- if not mount_prog.found() or not umount_prog.found() or not
mkfs_prog.found()
++ if mount_path == '' or umount_path == '' or mkfs_path == ''
+ fs_enable = false
+ endif
+ endif
+@@ -1863,15 +1902,17 @@ if conf.has('WITH_LIBVIRTD')
+ use_storage = true
+
+ conf.set('WITH_STORAGE_FS', 1)
+- conf.set_quoted('MOUNT', mount_prog.path())
+- conf.set_quoted('UMOUNT', umount_prog.path())
+- conf.set_quoted('MKFS', mkfs_prog.path())
++ conf.set_quoted('MOUNT', mount_path)
++ conf.set_quoted('UMOUNT', umount_path)
++ conf.set_quoted('MKFS', mkfs_path)
+
++ showmount_path = get_option('showmount_path')
++ if showmount_path == ''
+ showmount_prog = find_program('showmount', required: false, dirs:
libvirt_sbin_path)
+- showmount_path = ''
+ if showmount_prog.found()
+ showmount_path = showmount_prog.path()
+ endif
++ endif
+ conf.set_quoted('SHOWMOUNT', showmount_path)
+ endif
+ endif
+@@ -1883,7 +1924,7 @@ if conf.has('WITH_LIBVIRTD')
+ error('Need glusterfs (libgfapi) for gluster storage driver')
+ endif
+
+- if not get_option('storage_iscsi').disabled() and iscsiadm_prog.found()
++ if not get_option('storage_iscsi').disabled() and iscsiadm_path != ''
+ use_storage = true
+ conf.set('WITH_STORAGE_ISCSI', 1)
+ elif get_option('storage_iscsi').enabled()
+@@ -1906,11 +1947,17 @@ if conf.has('WITH_LIBVIRTD')
+ 'pvs', 'vgs', 'lvs',
+ ]
+ foreach name : lvm_progs
++ prog_path = get_option('@0@_path'.format(name))
++ if prog_path == ''
++ prog = find_program(name, required: get_option('storage_lvm'), dirs:
libvirt_sbin_path)
++ if prog.found()
++ prog_path = prog.path()
++ endif
++ endif
+ set_variable(
+- '@0@_prog'.format(name),
+- find_program(name, required: get_option('storage_lvm'), dirs:
libvirt_sbin_path)
++ '@0@_path'.format(name), prog_path
+ )
+- if not get_variable('@0@_prog'.format(name)).found()
++ if prog_path == ''
+ lvm_enable = false
+ endif
+ endforeach
+@@ -1920,7 +1967,7 @@ if conf.has('WITH_LIBVIRTD')
+ conf.set('WITH_STORAGE_LVM', 1)
+
+ foreach name : lvm_progs
+- conf.set_quoted(name.to_upper(),
get_variable('@0@_prog'.format(name)).path())
++ conf.set_quoted(name.to_upper(),
get_variable('@0@_path'.format(name)))
+ endforeach
+ endif
+ endif
+@@ -1945,12 +1992,17 @@ if conf.has('WITH_LIBVIRTD')
+ endif
+
+ if not get_option('storage_sheepdog').disabled()
++ sheepdogcli_path = get_option('sheepdogcli_path')
++ if sheepdogcli_path == ''
+ sheepdogcli_prog = find_program(['collie', 'dog'], required:
get_option('storage_sheepdog'), dirs: libvirt_sbin_path)
+-
+ if sheepdogcli_prog.found()
++ sheepdogcli_path = sheepdogcli_prog.path()
++ endif
++ endif
++ if sheepdogcli_path != ''
+ use_storage = true
+ conf.set('WITH_STORAGE_SHEEPDOG', 1)
+- conf.set_quoted('SHEEPDOGCLI', sheepdogcli_prog.path())
++ conf.set_quoted('SHEEPDOGCLI', sheepdogcli_path)
+ endif
+ endif
+
+@@ -1958,11 +2010,17 @@ if conf.has('WITH_LIBVIRTD')
+ vstorage_enable = true
+
+ foreach name : ['vstorage', 'vstorage-mount', 'umount']
++ prog_path = get_option('@0@_path'.format(name.underscorify()))
++ if prog_path == ''
++ prog = find_program(name, required: get_option('storage_vstorage'),
dirs: libvirt_sbin_path)
++ if prog.found()
++ prog_path = prog.path()
++ endif
++ endif
+ set_variable(
+- '@0@_prog'.format(name.underscorify()),
+- find_program(name, required: get_option('storage_vstorage'), dirs:
libvirt_sbin_path)
++ '@0@_path'.format(name.underscorify()), prog_path
+ )
+- if not get_variable('@0@_prog'.format(name.underscorify())).found()
++ if prog_path == ''
+ vstorage_enable = false
+ endif
+ endforeach
+@@ -1971,7 +2029,7 @@ if conf.has('WITH_LIBVIRTD')
+ use_storage = true
+ conf.set('WITH_STORAGE_VSTORAGE', 1)
+ foreach name : ['vstorage', 'vstorage-mount', 'umount']
+- path = get_variable('@0@_prog'.format(name.underscorify())).path()
++ path = get_variable('@0@_path'.format(name.underscorify()))
+ conf.set_quoted(name.to_upper(), path)
+ endforeach
+ endif
+@@ -1980,11 +2038,17 @@ if conf.has('WITH_LIBVIRTD')
+ if not get_option('storage_zfs').disabled()
+ zfs_enable = true
+ foreach name : ['zfs', 'zpool']
++ prog_path = get_option('@0@_path'.format(name))
++ if prog_path == ''
++ prog = find_program(name, required: get_option('storage_zfs'), dirs:
libvirt_sbin_path)
++ if prog.found()
++ prog_path = prog.path()
++ endif
++ endif
+ set_variable(
+- '@0@_prog'.format(name),
+- find_program(name, required: get_option('storage_zfs'), dirs:
libvirt_sbin_path)
++ '@0@_path'.format(name), prog_path
+ )
+- if not get_variable('@0@_prog'.format(name)).found()
++ if prog_path == ''
+ zfs_enable = false
+ endif
+ endforeach
+@@ -1993,7 +2057,7 @@ if conf.has('WITH_LIBVIRTD')
+ use_storage = true
+ conf.set('WITH_STORAGE_ZFS', 1)
+ foreach name : ['zfs', 'zpool']
+- conf.set_quoted(name.to_upper(),
get_variable('@0@_prog'.format(name)).path())
++ conf.set_quoted(name.to_upper(),
get_variable('@0@_path'.format(name)))
+ endforeach
+ endif
+ endif
+@@ -2104,10 +2168,16 @@ if not get_option('nss').disabled()
+ endif
+
+ if not get_option('numad').disabled() and numactl_dep.found()
++ numad_path = get_option('numad_path')
++ if numad_path == ''
+ numad_prog = find_program('numad', required: get_option('numad'), dirs:
libvirt_sbin_path)
+ if numad_prog.found()
++ numad_path = numad_prog.path()
++ endif
++ endif
++ if numad_path != ''
+ conf.set('WITH_NUMAD', 1)
+- conf.set_quoted('NUMAD', numad_prog.path())
++ conf.set_quoted('NUMAD', numad_path)
+ endif
+ elif get_option('numad').enabled()
+ error('You must have numactl enabled for numad support.')
+--- libvirt-6.10.0/build-aux/meson.build.orig 2020-12-01 09:51:29.000000000
+0100
++++ libvirt-6.10.0/build-aux/meson.build 2022-06-15 21:13:56.995821452
+0200
+@@ -2,10 +2,6 @@ syntax_check_conf = configuration_data()
+ syntax_check_conf.set('top_srcdir', meson.source_root())
+ syntax_check_conf.set('top_builddir', meson.build_root())
+
+-flake8_path = ''
+-if flake8_prog.found()
+- flake8_path = flake8_prog.path()
+-endif
+ syntax_check_conf.set('flake8_path', flake8_path)
+ syntax_check_conf.set('runutf8', ' '.join(runutf8))
+ syntax_check_conf.set('PYTHON3', python3_prog.path())
+--- libvirt-6.10.0/src/meson.build.orig 2020-12-01 09:51:29.000000000
+0100
++++ libvirt-6.10.0/src/meson.build 2022-06-15 21:23:22.326092128 +0200
+@@ -982,11 +982,11 @@ test(
+ env: runutf8,
+ )
+
+-if augparse_prog.found()
++if find_program('augparse', required: false).found()
+ foreach data : augeas_test_data
+ test(
+ 'check-augeas-@0@'.format(data['name']),
+- augparse_prog,
++ find_program('augparse'),
+ args: [
+ '-I', data['srcdir'],
+ '-I', data['builddir'],
+@@ -996,7 +996,7 @@ if augparse_prog.found()
+ endforeach
+ endif
+
+-if pdwtags_prog.found() and cc.get_id() != 'clang'
++if pdwtags_path != '' and cc.get_id() != 'clang'
+ foreach proto : check_protocols
+ lib = proto['lib']
+ test(
+@@ -1007,7 +1007,7 @@ if pdwtags_prog.found() and cc.get_id()
+ proto['name'],
+ lib.name(),
+ lib.full_path(),
+- pdwtags_prog.path(),
++ pdwtags_path,
+ files('@0@-structs'.format(proto['name'])),
+ ],
+ env: runutf8,
+--- libvirt-6.10.0/meson_options.txt.orig 2020-12-01 09:51:29.000000000
+0100
++++ libvirt-6.10.0/meson_options.txt 2022-06-15 21:47:27.468263121 +0200
+@@ -102,3 +102,51 @@ option('numad', type: 'feature', value:
+ option('pm_utils', type: 'feature', value: 'auto', description: 'use pm-utils
for power management')
+ option('sysctl_config', type: 'feature', value: 'auto', description: 'Whether
to install sysctl configs')
+ option('tls_priority', type: 'string', value: 'NORMAL', description: 'set the
default TLS session priority string')
++
++option('addr2line_path', type: 'string', value: '', description: 'executable
path')
++option('augparse_path', type: 'string', value: '', description: 'executable
path')
++option('dmidecode_path', type: 'string', value: '', description: 'executable
path')
++option('dnsmasq_path', type: 'string', value: '', description: 'executable
path')
++option('ebtables_path', type: 'string', value: '', description: 'executable
path')
++option('flake8_path', type: 'string', value: '', description: 'executable
path')
++option('ip6tables_path', type: 'string', value: '', description: 'executable
path')
++option('ip_path', type: 'string', value: '', description: 'executable path')
++option('iptables_path', type: 'string', value: '', description: 'executable
path')
++option('iscsiadm_path', type: 'string', value: '', description: 'executable
path')
++option('lvchange_path', type: 'string', value: '', description: 'executable
path')
++option('lvcreate_path', type: 'string', value: '', description: 'executable
path')
++option('lvremove_path', type: 'string', value: '', description: 'executable
path')
++option('lvs_path', type: 'string', value: '', description: 'executable path')
++option('mdevctl_path', type: 'string', value: '', description: 'executable
path')
++option('mkfs_path', type: 'string', value: '', description: 'executable path')
++option('mm_ctl_path', type: 'string', value: '', description: 'executable
path')
++option('modprobe_path', type: 'string', value: '', description: 'executable
path')
++option('mount_path', type: 'string', value: '', description: 'executable
path')
++option('numad_path', type: 'string', value: '', description: 'executable
path')
++option('ovs_vsctl_path', type: 'string', value: '', description: 'executable
path')
++option('parted_path', type: 'string', value: '', description: 'executable
path')
++option('pdwtags_path', type: 'string', value: '', description: 'executable
path')
++option('pvcreate_path', type: 'string', value: '', description: 'executable
path')
++option('pvremove_path', type: 'string', value: '', description: 'executable
path')
++option('pvs_path', type: 'string', value: '', description: 'executable path')
++option('qemu_bridge_path', type: 'string', value: '', description:
'executable path')
++option('qemu_dbus_daemon_path', type: 'string', value: '', description:
'executable path')
++option('qemu_pr_path', type: 'string', value: '', description: 'executable
path')
++option('qemu_slirp_path', type: 'string', value: '', description: 'executable
path')
++option('radvd_path', type: 'string', value: '', description: 'executable
path')
++option('rmmod_path', type: 'string', value: '', description: 'executable
path')
++option('scrub_path', type: 'string', value: '', description: 'executable
path')
++option('sheepdogcli_path', type: 'string', value: '', description:
'executable path')
++option('showmount_path', type: 'string', value: '', description: 'executable
path')
++option('tc_path', type: 'string', value: '', description: 'executable path')
++option('udevadm_path', type: 'string', value: '', description: 'executable
path')
++option('umount_path', type: 'string', value: '', description: 'executable
path')
++option('vgchange_path', type: 'string', value: '', description: 'executable
path')
++option('vgcreate_path', type: 'string', value: '', description: 'executable
path')
++option('vgremove_path', type: 'string', value: '', description: 'executable
path')
++option('vgs_path', type: 'string', value: '', description: 'executable path')
++option('vgscan_path', type: 'string', value: '', description: 'executable
path')
++option('vstorage_path', type: 'string', value: '', description: 'executable
path')
++option('vstorage_mount_path', type: 'string', value: '', description:
'executable path')
++option('zfs_path', type: 'string', value: '', description: 'executable path')
++option('zpool_path', type: 'string', value: '', description: 'executable
path')
diff --git a/libvirt-paths.patch b/libvirt-paths.patch
new file mode 100644
index 0000000..7f73ba6
--- /dev/null
+++ b/libvirt-paths.patch
@@ -0,0 +1,33 @@
+--- libvirt-6.10.0/src/remote/meson.build.orig 2020-12-01 09:51:29.000000000
+0100
++++ libvirt-6.10.0/src/remote/meson.build 2022-06-14 22:25:21.337346825
+0200
+@@ -309,7 +309,7 @@ endif
+ if conf.has('WITH_SASL')
+ install_data(
+ 'libvirtd.sasl',
+- install_dir: sysconfdir / 'sasl2',
++ install_dir: sysconfdir / 'sasl',
+ rename: [ 'libvirt.conf' ],
+ )
+ endif
+--- libvirt-6.10.0/src/meson.build.orig 2020-12-01 09:51:29.000000000
+0100
++++ libvirt-6.10.0/src/meson.build 2022-06-14 22:25:40.023912258 +0200
+@@ -781,7 +781,7 @@ endforeach
+ if conf.has('WITH_LIBVIRTD')
+ # Generate systemd service and socket unit files
+ if init_script == 'systemd'
+- systemd_unit_dir = prefix / 'lib' / 'systemd' / 'system'
++ systemd_unit_dir = '/lib' / 'systemd' / 'system'
+
+ install_data(
+ guest_unit_files,
+--- libvirt-6.10.0/tools/meson.build.orig 2020-12-01 09:51:29.000000000
+0100
++++ libvirt-6.10.0/tools/meson.build 2022-06-15 22:51:42.020714552 +0200
+@@ -283,7 +283,7 @@ if init_script == 'systemd'
+ output: '@BASENAME@',
+ configuration: tools_conf,
+ install: true,
+- install_dir: prefix / 'lib' / 'systemd' / 'system',
++ install_dir: '/lib' / 'systemd' / 'system',
+ )
+ endif
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libvirt.git/commitdiff/40a24f8b2d50b2f96cee9aa61d0e4c77278dac36
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
