X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=libvirt-sysctl-dir.patch;h=a8245ca827b355b7a1e5c54f0ea0de40f3c83f4a;hb=bc937a84a2db6acd07b2996f197d3db2f38922fb;hp=7ce574d80cb9b82fd50d0142115e20c9c7650426;hpb=6a3aea129d7eb0d04011cf9beefd2b6472495b7d;p=packages%2Flibvirt.git

diff --git a/libvirt-sysctl-dir.patch b/libvirt-sysctl-dir.patch
index 7ce574d..a8245ca 100644
--- a/libvirt-sysctl-dir.patch
+++ b/libvirt-sysctl-dir.patch
@@ -1,19 +1,16 @@
-diff -ur libvirt-1.2.17.orig/daemon/Makefile.am libvirt-1.2.17/daemon/Makefile.am
---- libvirt-1.2.17.orig/daemon/Makefile.am	2015-06-25 14:00:33.000000000 +0000
-+++ libvirt-1.2.17/daemon/Makefile.am	2015-07-10 16:28:56.157230844 +0000
-@@ -396,13 +396,11 @@
- # 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-6.10.0.orig/src/remote/meson.build libvirt-6.10.0/src/remote/meson.build
+--- libvirt-6.10.0.orig/src/remote/meson.build	2021-01-01 20:42:34.317692686 +0100
++++ libvirt-6.10.0/src/remote/meson.build	2021-01-01 20:46:19.143692686 +0100
+@@ -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