- updated to 4.5.0

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

diff --git a/libvirt-sysctl-dir.patch b/libvirt-sysctl-dir.patch
index 7ce574d80cb9b82fd50d0142115e20c9c7650426..4834b1441bef78794d86f12b53de5f6f2984581a 100644 (file)
--- a/libvirt-sysctl-dir.patch
+++ b/libvirt-sysctl-dir.patch
@@ -1,12 +1,31 @@
-diff -ur libvirt-1.2.17.orig/daemon/Makefile.am libvirt-1.2.17/daemon/Makefile.am
---- libvirt-1.2.17.orig/daemon/Makefile.am     2015-06-25 14:00:33.000000000 +0000
-+++ libvirt-1.2.17/daemon/Makefile.am  2015-07-10 16:28:56.157230844 +0000
-@@ -396,13 +396,11 @@
+diff -urp libvirt-4.5.0.orig/src/Makefile.in libvirt-4.5.0/src/Makefile.in
+--- libvirt-4.5.0.orig/src/Makefile.in 2018-07-09 16:30:47.099854268 +0000
++++ libvirt-4.5.0/src/Makefile.in      2018-07-09 16:31:05.422853176 +0000
+@@ -13125,13 +13125,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.5.0.orig/src/remote/Makefile.inc.am libvirt-4.5.0/src/remote/Makefile.inc.am
+--- libvirt-4.5.0.orig/src/remote/Makefile.inc.am      2018-07-09 16:30:47.115854267 +0000
++++ libvirt-4.5.0/src/remote/Makefile.inc.am   2018-07-09 16:31:05.423853176 +0000
+@@ -199,13 +199,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:
 -      $(MKDIR_P) $(DESTDIR)$(prefix)/lib/sysctl.d
-       $(INSTALL_DATA) $(srcdir)/libvirtd.sysctl \
+       $(INSTALL_DATA) $(srcdir)/remote/libvirtd.sysctl \
 -        $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf
 +        $(DESTDIR)$(sysconfdir)/sysctl.d/60-libvirtd.conf