- updated to 6.10.0, now uses meson for building

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

diff --git a/libvirt-sysctl-dir.patch b/libvirt-sysctl-dir.patch
index f5f25ea72dd8340fe0aab3ea8c33904e04f44e29..a8245ca827b355b7a1e5c54f0ea0de40f3c83f4a 100644 (file)
--- a/libvirt-sysctl-dir.patch
+++ b/libvirt-sysctl-dir.patch
@@ -1,24 +1,16 @@
-diff -ur libvirt-5.6.0.orig/src/Makefile.in libvirt-5.6.0/src/Makefile.in
---- libvirt-5.6.0.orig/src/Makefile.in 2019-08-18 18:16:31.092000000 +0200
-+++ libvirt-5.6.0/src/Makefile.in      2019-08-18 18:16:45.444000000 +0200
-@@ -6722,7 +6722,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.6.0.orig/src/remote/Makefile.inc.am libvirt-5.6.0/src/remote/Makefile.inc.am
---- libvirt-5.6.0.orig/src/remote/Makefile.inc.am      2019-08-18 18:16:31.077000000 +0200
-+++ libvirt-5.6.0/src/remote/Makefile.inc.am   2019-08-18 18:16:45.445000000 +0200
-@@ -200,7 +200,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