- updated to 7.7.0

[packages/libvirt.git] / libvirt-sysctl-dir.patch

diff --git a/libvirt-sysctl-dir.patch b/libvirt-sysctl-dir.patch
index 3f2acd4987d566f5b795823099269ae42ac4e4fa..7819d6117a51438913293d9f27e27e1d91c3b449 100644 (file)
--- a/libvirt-sysctl-dir.patch
+++ b/libvirt-sysctl-dir.patch
@@ -1,19 +1,16 @@
-diff -urp libvirt-3.0.0.orig/daemon/Makefile.am libvirt-3.0.0/daemon/Makefile.am
---- libvirt-3.0.0.orig/daemon/Makefile.am      2017-02-11 16:03:23.470360384 +0000
-+++ libvirt-3.0.0/daemon/Makefile.am   2017-02-11 16:03:38.597360214 +0000
-@@ -402,13 +402,11 @@ if WITH_SYSCTL
- # Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on
- # /usr/lib/sysctl.d/ even when libdir is /usr/lib64
- install-sysctl:
--      $(MKDIR_P) $(DESTDIR)$(prefix)/lib/sysctl.d
-       $(INSTALL_DATA) $(srcdir)/libvirtd.sysctl \
--        $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf
-+        $(DESTDIR)$(sysconfdir)/sysctl.d/60-libvirtd.conf
+diff -ur libvirt-7.5.0.orig/src/remote/meson.build libvirt-7.5.0/src/remote/meson.build
+--- libvirt-7.5.0.orig/src/remote/meson.build  2021-07-10 01:22:28.190677568 +0200
++++ libvirt-7.5.0/src/remote/meson.build       2021-07-10 01:22:48.926677568 +0200
+@@ -265,11 +265,9 @@
+     endforeach
  
- uninstall-sysctl:
--      rm -f $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf
--      rmdir $(DESTDIR)$(prefix)/lib/sysctl.d || :
-+      rm -f $(DESTDIR)$(sysconfdir)/sysctl.d/60-libvirtd.conf
- else ! WITH_SYSCTL
- install-sysctl:
- uninstall-sysctl:
+     if conf.has('WITH_SYSCTL')
+-      # Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on
+-      # /usr/lib/sysctl.d/ even when libdir is /usr/lib64
+       install_data(
+         'libvirtd.sysctl',
+-        install_dir: prefix / 'lib' / 'sysctl.d',
++        install_dir: sysconfdir / 'sysctl.d',
+         rename: [ '60-libvirtd.conf' ],
+       )
+     endif