- updated to 11.3.0

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

diff --git a/libvirt-sysctl-dir.patch b/libvirt-sysctl-dir.patch
index 7ce574d80cb9b82fd50d0142115e20c9c7650426..a0acea497e6288b2517d8314af0e6d9f22864e8b 100644 (file)
--- a/libvirt-sysctl-dir.patch
+++ b/libvirt-sysctl-dir.patch
@@ -1,19 +1,28 @@
-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 @@
- # 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 \
--        $(DESTDIR)$(prefix)/lib/sysctl.d/60-libvirtd.conf
-+        $(DESTDIR)$(sysconfdir)/sysctl.d/60-libvirtd.conf
+diff -ur libvirt-11.2.0.orig/src/qemu/meson.build libvirt-11.2.0/src/qemu/meson.build
+--- libvirt-11.2.0.orig/src/qemu/meson.build   2025-04-17 13:07:08.510540390 +0200
++++ libvirt-11.2.0/src/qemu/meson.build        2025-04-17 13:07:20.274568858 +0200
+@@ -214,7 +214,7 @@
+   if conf.has('WITH_USERFAULTFD_SYSCTL')
+     install_data(
+       'postcopy-migration.sysctl',
+-      install_dir: prefix / 'lib' / 'sysctl.d',
++      install_dir: sysconfdir / 'sysctl.d',
+       rename: [ '60-qemu-postcopy-migration.conf' ],
+     )
+   endif
+diff -ur libvirt-11.2.0.orig/src/remote/meson.build libvirt-11.2.0/src/remote/meson.build
+--- libvirt-11.2.0.orig/src/remote/meson.build 2025-04-17 13:07:08.514540399 +0200
++++ libvirt-11.2.0/src/remote/meson.build      2025-04-17 13:07:20.278568868 +0200
+@@ -284,11 +284,9 @@
+     endforeach
  
- 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