X-Git-Url: https://git.tld-linux.org/?p=packages%2Flibvirt.git;a=blobdiff_plain;f=libvirt-sysctl-dir.patch;h=a8245ca827b355b7a1e5c54f0ea0de40f3c83f4a;hp=e6b16f8c63e1b715c43a16cf61cac62b516e277e;hb=3e36cfaeb430c9abf7b9a6b93d92661d49120ce4;hpb=60d0909aad60cee96ddf2119563f92fe778f2269

diff --git a/libvirt-sysctl-dir.patch b/libvirt-sysctl-dir.patch
index e6b16f8..a8245ca 100644
--- a/libvirt-sysctl-dir.patch
+++ b/libvirt-sysctl-dir.patch
@@ -1,24 +1,16 @@
-diff -ur libvirt-6.1.0.orig/src/Makefile.in libvirt-6.1.0/src/Makefile.in
---- libvirt-6.1.0.orig/src/Makefile.in	2020-03-06 09:52:13.294000000 +0100
-+++ libvirt-6.1.0/src/Makefile.in	2020-03-06 09:52:22.081000000 +0100
-@@ -6266,7 +6266,7 @@
+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
  
- # Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on
- # /usr/lib/sysctl.d/ even when libdir is /usr/lib64
--@WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@sysctldir = $(prefix)/lib/sysctl.d
-+@WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@sysctldir = $(sysconfdir)/sysctl.d
- @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@polkitdir = $(datadir)/polkit-1
- @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@polkitactionsdir = $(polkitdir)/actions
- @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@polkitrulesdir = $(polkitdir)/rules.d
-diff -ur libvirt-6.1.0.orig/src/remote/Makefile.inc.am libvirt-6.1.0/src/remote/Makefile.inc.am
---- libvirt-6.1.0.orig/src/remote/Makefile.inc.am	2020-03-06 09:52:13.305000000 +0100
-+++ libvirt-6.1.0/src/remote/Makefile.inc.am	2020-03-06 09:52:22.081000000 +0100
-@@ -334,7 +334,7 @@
- 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
--sysctldir = $(prefix)/lib/sysctl.d
-+sysctldir = $(sysconfdir)/sysctl.d
- 
- install-sysctl:
- 	$(MKDIR_P) $(DESTDIR)$(sysctldir)
+     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