- updated to 4.2.0

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

diff --git a/libvirt-sysctl-dir.patch b/libvirt-sysctl-dir.patch
index 9faf43d11114a78c9fd4da8197f98c0eef43ac68..a50224fe39329c3b505c750c5cae2a5a9aceb501 100644 (file)
--- a/libvirt-sysctl-dir.patch
+++ b/libvirt-sysctl-dir.patch
@@ -1,7 +1,26 @@
-diff -urp libvirt-4.1.0.orig/src/Makefile.am libvirt-4.1.0/src/Makefile.am
---- libvirt-4.1.0.orig/src/Makefile.am 2018-03-12 10:52:52.000000000 +0000
-+++ libvirt-4.1.0/src/Makefile.am      2018-03-12 11:03:24.668941705 +0000
-@@ -2232,13 +2232,11 @@ if WITH_SYSCTL
+diff -urp libvirt-4.2.0.orig/src/Makefile.in libvirt-4.2.0/src/Makefile.in
+--- libvirt-4.2.0.orig/src/Makefile.in 2018-04-12 12:49:25.591575905 +0000
++++ libvirt-4.2.0/src/Makefile.in      2018-04-12 12:54:21.166572577 +0000
+@@ -13057,13 +13057,11 @@ lxc/lxc_controller_dispatch.h: $(srcdir)
+ # 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@install-sysctl:
+-@WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@        $(MKDIR_P) $(DESTDIR)$(prefix)/lib/sysctl.d
+ @WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@        $(INSTALL_DATA) $(srcdir)/remote/libvirtd.sysctl \
+-@WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@          $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf
++@WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@          $(DESTDIR)$(sysconfdir)/sysctl.d/60-libvirtd.conf
+ 
+ @WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@uninstall-sysctl:
+-@WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@        rm -f $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf
+-@WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@        rmdir $(DESTDIR)$(prefix)/lib/sysctl.d || :
++@WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_TRUE@        rm -f $(DESTDIR)$(sysconfdir)/sysctl.d/60-libvirtd.conf
+ @WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_FALSE@install-sysctl:
+ @WITH_LIBVIRTD_TRUE@@WITH_SYSCTL_FALSE@uninstall-sysctl:
+ 
+diff -urp libvirt-4.2.0.orig/src/remote/Makefile.inc.am libvirt-4.2.0/src/remote/Makefile.inc.am
+--- libvirt-4.2.0.orig/src/remote/Makefile.inc.am      2018-04-12 12:49:25.608575905 +0000
++++ libvirt-4.2.0/src/remote/Makefile.inc.am   2018-04-12 12:52:11.899574033 +0000
+@@ -194,13 +194,11 @@ 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
  install-sysctl: