- updated to 7.7.0

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

diff --git a/libvirt-sysctl-dir.patch b/libvirt-sysctl-dir.patch
index 4834b1441bef78794d86f12b53de5f6f2984581a..7819d6117a51438913293d9f27e27e1d91c3b449 100644 (file)
--- a/libvirt-sysctl-dir.patch
+++ b/libvirt-sysctl-dir.patch
@@ -1,38 +1,16 @@
-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
+diff -ur libvirt-7.5.0.orig/src/remote/meson.build libvirt-7.5.0/src/remote/meson.build
+--- libvirt-7.5.0.orig/src/remote/meson.build  2021-07-10 01:22:28.190677568 +0200
++++ libvirt-7.5.0/src/remote/meson.build       2021-07-10 01:22:48.926677568 +0200
+@@ -265,11 +265,9 @@
+     endforeach
  
- @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)/remote/libvirtd.sysctl \
--        $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf
-+        $(DESTDIR)$(sysconfdir)/sysctl.d/60-libvirtd.conf
- 
- 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:
+     if conf.has('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_data(
+         'libvirtd.sysctl',
+-        install_dir: prefix / 'lib' / 'sysctl.d',
++        install_dir: sysconfdir / 'sysctl.d',
+         rename: [ '60-libvirtd.conf' ],
+       )
+     endif