X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=libvirt-sysctl-dir.patch;h=3829e53c05b8e8f78a4d5b50ca02c997f0cb9707;hb=2b677ce945111ed66d2c3c4b4a6eb0be3a3afab2;hp=a50224fe39329c3b505c750c5cae2a5a9aceb501;hpb=d139c6b6c09e77a47960a391fa2c8ee0b4fcdb81;p=packages%2Flibvirt.git

diff --git a/libvirt-sysctl-dir.patch b/libvirt-sysctl-dir.patch
index a50224f..3829e53 100644
--- a/libvirt-sysctl-dir.patch
+++ b/libvirt-sysctl-dir.patch
@@ -1,38 +1,24 @@
-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)
+diff -urp libvirt-5.4.0.orig/src/Makefile.in libvirt-5.4.0/src/Makefile.in
+--- libvirt-5.4.0.orig/src/Makefile.in	2019-06-17 20:22:00.311000000 +0200
++++ libvirt-5.4.0/src/Makefile.in	2019-06-17 20:22:13.032000000 +0200
+@@ -6250,7 +6250,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.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
+-@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.4.0.orig/src/remote/Makefile.inc.am libvirt-5.4.0/src/remote/Makefile.inc.am
+--- libvirt-5.4.0.orig/src/remote/Makefile.inc.am	2019-06-17 20:22:00.336000000 +0200
++++ libvirt-5.4.0/src/remote/Makefile.inc.am	2019-06-17 20:22:13.032000000 +0200
+@@ -195,7 +195,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)