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

diff --git a/libvirt-sysctl-dir.patch b/libvirt-sysctl-dir.patch
index 51b44c9..a8245ca 100644
--- a/libvirt-sysctl-dir.patch
+++ b/libvirt-sysctl-dir.patch
@@ -1,24 +1,16 @@
-diff -ur libvirt-5.8.0.orig/src/Makefile.in libvirt-5.8.0/src/Makefile.in
---- libvirt-5.8.0.orig/src/Makefile.in	2019-10-20 16:09:38.505000000 +0200
-+++ libvirt-5.8.0/src/Makefile.in	2019-10-20 16:09:51.396000000 +0200
-@@ -7318,7 +7318,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-5.8.0.orig/src/remote/Makefile.inc.am libvirt-5.8.0/src/remote/Makefile.inc.am
---- libvirt-5.8.0.orig/src/remote/Makefile.inc.am	2019-10-20 16:09:38.518000000 +0200
-+++ libvirt-5.8.0/src/remote/Makefile.inc.am	2019-10-20 16:09:51.397000000 +0200
-@@ -312,7 +312,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