X-Git-Url: https://git.tld-linux.org/?p=packages%2Flibvirt.git;a=blobdiff_plain;f=libvirt-sysctl-dir.patch;h=bf8fd3955374934a513487efb4e4fc54c18a81aa;hp=4834b1441bef78794d86f12b53de5f6f2984581a;hb=7470b860cfb9847023a18a90d640e4ed229e6310;hpb=99a79a91e301c50ee0384d32c3c27108e850b2b4

diff --git a/libvirt-sysctl-dir.patch b/libvirt-sysctl-dir.patch
index 4834b14..bf8fd39 100644
--- a/libvirt-sysctl-dir.patch
+++ b/libvirt-sysctl-dir.patch
@@ -1,38 +1,24 @@
-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)
+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
- @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
+-@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
- install-sysctl:
--	$(MKDIR_P) $(DESTDIR)$(prefix)/lib/sysctl.d
- 	$(INSTALL_DATA) $(srcdir)/remote/libvirtd.sysctl \
--	  $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf
-+	  $(DESTDIR)$(sysconfdir)/sysctl.d/60-libvirtd.conf
+-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)