X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=libvirt-sysctl-dir.patch;h=bf8fd3955374934a513487efb4e4fc54c18a81aa;hb=7470b860cfb9847023a18a90d640e4ed229e6310;hp=3f2acd4987d566f5b795823099269ae42ac4e4fa;hpb=392f6a6608e85bb2105c0ad3d5856c033cc35f6a;p=packages%2Flibvirt.git diff --git a/libvirt-sysctl-dir.patch b/libvirt-sysctl-dir.patch index 3f2acd4..bf8fd39 100644 --- a/libvirt-sysctl-dir.patch +++ b/libvirt-sysctl-dir.patch @@ -1,19 +1,24 @@ -diff -urp libvirt-3.0.0.orig/daemon/Makefile.am libvirt-3.0.0/daemon/Makefile.am ---- libvirt-3.0.0.orig/daemon/Makefile.am 2017-02-11 16:03:23.470360384 +0000 -+++ libvirt-3.0.0/daemon/Makefile.am 2017-02-11 16:03:38.597360214 +0000 -@@ -402,13 +402,11 @@ if WITH_SYSCTL +diff -urp libvirt-5.1.0.orig/src/Makefile.in libvirt-5.1.0/src/Makefile.in +--- libvirt-5.1.0.orig/src/Makefile.in 2019-03-23 11:51:54.916000000 +0100 ++++ libvirt-5.1.0/src/Makefile.in 2019-03-23 11:54:04.581000000 +0100 +@@ -6219,7 +6219,7 @@ REMOTE_DRIVER_PROTOCOL = \ + # 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 +-@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 -urp libvirt-5.1.0.orig/src/remote/Makefile.inc.am libvirt-5.1.0/src/remote/Makefile.inc.am +--- libvirt-5.1.0.orig/src/remote/Makefile.inc.am 2019-03-23 11:51:54.904000000 +0100 ++++ libvirt-5.1.0/src/remote/Makefile.inc.am 2019-03-23 11:55:06.720000000 +0100 +@@ -193,7 +193,7 @@ check-augeas-remote: test_libvirtd.aug + 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 - 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: + $(MKDIR_P) $(DESTDIR)$(sysctldir)