X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=libvirt-sysctl-dir.patch;h=7819d6117a51438913293d9f27e27e1d91c3b449;hb=07c02faa76daf855ff3897afb78a1c406534ad51;hp=d6afa50a0be2d6aaf7843349e0b2b47efab12afd;hpb=c833928a7e72d39a9e4302b345e26bad8fbbd5ff;p=packages%2Flibvirt.git

diff --git a/libvirt-sysctl-dir.patch b/libvirt-sysctl-dir.patch
index d6afa50..7819d61 100644
--- a/libvirt-sysctl-dir.patch
+++ b/libvirt-sysctl-dir.patch
@@ -1,24 +1,16 @@
-diff -ur libvirt-5.5.0.orig/src/Makefile.in libvirt-5.5.0/src/Makefile.in
---- libvirt-5.5.0.orig/src/Makefile.in	2019-07-14 19:28:49.824000000 +0200
-+++ libvirt-5.5.0/src/Makefile.in	2019-07-14 19:29:06.685000000 +0200
-@@ -6716,7 +6716,7 @@
+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
  
- # 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.5.0.orig/src/remote/Makefile.inc.am libvirt-5.5.0/src/remote/Makefile.inc.am
---- libvirt-5.5.0.orig/src/remote/Makefile.inc.am	2019-07-14 19:28:49.809000000 +0200
-+++ libvirt-5.5.0/src/remote/Makefile.inc.am	2019-07-14 19:29:06.685000000 +0200
-@@ -195,7 +195,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