[libvirt PATCH 228/351] meson: src: install libvirt daemon sysconf files

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx>
---
 src/Makefile.am                 | 19 -------------------
 src/interface/Makefile.inc.am   |  6 ------
 src/interface/meson.build       |  5 +++++
 src/libxl/Makefile.inc.am       |  2 --
 src/libxl/meson.build           |  5 +++++
 src/locking/Makefile.inc.am     |  1 -
 src/locking/meson.build         |  5 +++++
 src/logging/Makefile.inc.am     |  3 ---
 src/logging/meson.build         |  5 +++++
 src/lxc/Makefile.inc.am         |  2 --
 src/lxc/meson.build             |  5 +++++
 src/meson.build                 | 14 ++++++++++++++
 src/network/Makefile.inc.am     |  2 --
 src/network/meson.build         |  5 +++++
 src/node_device/Makefile.inc.am |  5 -----
 src/node_device/meson.build     |  5 +++++
 src/nwfilter/Makefile.inc.am    |  2 --
 src/nwfilter/meson.build        |  5 +++++
 src/qemu/Makefile.inc.am        |  1 -
 src/qemu/meson.build            |  5 +++++
 src/remote/Makefile.inc.am      |  5 -----
 src/remote/meson.build          | 10 ++++++++++
 src/secret/Makefile.inc.am      |  4 ----
 src/secret/meson.build          |  5 +++++
 src/storage/Makefile.inc.am     |  4 ----
 src/storage/meson.build         |  5 +++++
 src/vbox/Makefile.inc.am        |  4 ----
 src/vbox/meson.build            |  5 +++++
 src/vz/Makefile.inc.am          |  5 -----
 src/vz/meson.build              |  5 +++++
 30 files changed, 89 insertions(+), 65 deletions(-)
 delete mode 100644 src/logging/Makefile.inc.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 0b40c23f980..c403a1d6b33 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,11 +34,9 @@ tapset_DATA =
 endif WITH_DTRACE_PROBES
 RPC_PROBE_FILES =
 LOGROTATE_FILES_IN =
-SYSCONF_FILES =
 
 include security/Makefile.inc.am
 include access/Makefile.inc.am
-include logging/Makefile.inc.am
 include locking/Makefile.inc.am
 include admin/Makefile.inc.am
 include vbox/Makefile.inc.am
@@ -200,23 +198,6 @@ libvirt_functions.stp: $(RPC_PROBE_FILES) $(top_srcdir)/scripts/gensystemtap.py
 
 endif WITH_DTRACE_PROBES
 
-install-sysconfig:
-	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
-	for f in $(SYSCONF_FILES:%.sysconf=%) ; \
-	do \
-	  tgt=`basename $$f`; \
-	  $(INSTALL_DATA) $(srcdir)/$$f.sysconf \
-	      $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
-	done
-
-uninstall-sysconfig:
-	for f in $(SYSCONF_FILES:%.sysconf=%) ; \
-	do \
-	  tgt=`basename $$f`; \
-	  rm -f $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
-	done
-	rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
-
 LOGROTATE_FILES := $(LOGROTATE_FILES_IN:remote/%.in=%)
 
 %.logrotate: remote/%.logrotate.in
diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am
index f6626c7f491..06bd8f820b1 100644
--- a/src/interface/Makefile.inc.am
+++ b/src/interface/Makefile.inc.am
@@ -3,9 +3,3 @@
 DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES))
 STATEFUL_DRIVER_SOURCE_FILES += \
 	$(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES))
-
-if WITH_INTERFACE
-
-SYSCONF_FILES += interface/virtinterfaced.sysconf
-
-endif WITH_INTERFACE
diff --git a/src/interface/meson.build b/src/interface/meson.build
index a6b3e888358..8b5347bce43 100644
--- a/src/interface/meson.build
+++ b/src/interface/meson.build
@@ -53,4 +53,9 @@ if conf.has('WITH_INTERFACE')
     'name': 'virtinterfaced',
     'in_file': files('virtinterfaced.init.in')
   }
+
+  sysconf_files += {
+    'name': 'virtinterfaced',
+    'file': files('virtinterfaced.sysconf'),
+  }
 endif
diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am
index 9a33eb5f06b..0031adb2ef3 100644
--- a/src/libxl/Makefile.inc.am
+++ b/src/libxl/Makefile.inc.am
@@ -5,8 +5,6 @@ STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(LIBXL_DRIVER_SOURCES))
 
 if WITH_LIBXL
 
-SYSCONF_FILES += libxl/virtxend.sysconf
-
 INSTALL_DATA_DIRS += libxl
 
 install-data-libxl:
diff --git a/src/libxl/meson.build b/src/libxl/meson.build
index 5f858dc32fc..722a001e079 100644
--- a/src/libxl/meson.build
+++ b/src/libxl/meson.build
@@ -72,4 +72,9 @@ if conf.has('WITH_LIBXL')
     'name': 'virtxend',
     'in_file': files('virtxend.init.in'),
   }
+
+  sysconf_files += {
+    'name': 'virtxend',
+    'file': files('virtxend.sysconf'),
+  }
 endif
diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am
index 8a0ecd8d1f2..02ce2fa7a77 100644
--- a/src/locking/Makefile.inc.am
+++ b/src/locking/Makefile.inc.am
@@ -1,7 +1,6 @@
 # vim: filetype=automake
 
 RPC_PROBE_FILES += $(srcdir)/locking/lock_protocol.x
-SYSCONF_FILES += locking/virtlockd.sysconf
 
 INSTALL_DATA_DIRS += locking
 
diff --git a/src/locking/meson.build b/src/locking/meson.build
index f560c9b44b9..1d42682d608 100644
--- a/src/locking/meson.build
+++ b/src/locking/meson.build
@@ -149,6 +149,11 @@ if conf.has('WITH_LIBVIRTD')
     'in_file': files('virtlockd.init.in'),
   }
 
+  sysconf_files += {
+    'name': 'virtlockd',
+    'file': files('virtlockd.sysconf'),
+  }
+
   if conf.has('WITH_SANLOCK')
     virt_helpers += {
       'name': 'libvirt_sanlock_helper',
diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am
deleted file mode 100644
index 48cae3add15..00000000000
--- a/src/logging/Makefile.inc.am
+++ /dev/null
@@ -1,3 +0,0 @@
-# vim: filetype=automake
-
-SYSCONF_FILES += logging/virtlogd.sysconf
diff --git a/src/logging/meson.build b/src/logging/meson.build
index 40327241e3c..8e913fb352f 100644
--- a/src/logging/meson.build
+++ b/src/logging/meson.build
@@ -92,4 +92,9 @@ if conf.has('WITH_LIBVIRTD')
     'name': 'virtlogd',
     'in_file': files('virtlogd.init.in'),
   }
+
+  sysconf_files += {
+    'name': 'virtlogd',
+    'file': files('virtlogd.sysconf'),
+  }
 endif
diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am
index 3cf6f96ea1d..f65b1cdf6b9 100644
--- a/src/lxc/Makefile.inc.am
+++ b/src/lxc/Makefile.inc.am
@@ -11,8 +11,6 @@ STATEFUL_DRIVER_SOURCE_FILES += \
 
 if WITH_LXC
 
-SYSCONF_FILES += lxc/virtlxcd.sysconf
-
 if WITH_DTRACE_PROBES
 RPC_PROBE_FILES += $(srcdir)/lxc/lxc_monitor_protocol.x
 endif
diff --git a/src/lxc/meson.build b/src/lxc/meson.build
index 6135f61d4ab..bcb5798dbc7 100644
--- a/src/lxc/meson.build
+++ b/src/lxc/meson.build
@@ -155,4 +155,9 @@ if conf.has('WITH_LXC')
     'name': 'virtlxcd',
     'in_file': files('virtlxcd.init.in'),
   }
+
+  sysconf_files += {
+    'name': 'virtlxcd',
+    'file': files('virtlxcd.sysconf'),
+  }
 endif
diff --git a/src/meson.build b/src/meson.build
index 602e8176d99..7d1b9714218 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -197,6 +197,12 @@ virt_daemon_units = []
 #   * in_file - source init file (required)
 openrc_init_files = []
 
+# sysconf_files
+#   install libvirt daemon sysconf files
+#   * name - daemon name (required)
+#   * file - source sysconf file (required)
+sysconf_files = []
+
 
 # list subdirectories
 
@@ -760,3 +766,11 @@ if conf.has('WITH_LIBVIRTD')
     endforeach
   endif
 endif
+
+foreach sysconf : sysconf_files
+  install_data(
+    sysconf['file'],
+    install_dir: sysconfdir / 'sysconfig',
+    rename: [ sysconf['name'] ],
+  )
+endforeach
diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am
index 81971c64ed4..2202903870f 100644
--- a/src/network/Makefile.inc.am
+++ b/src/network/Makefile.inc.am
@@ -5,8 +5,6 @@ STATEFUL_DRIVER_SOURCE_FILES += \
 	$(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES))
 
 if WITH_NETWORK
-SYSCONF_FILES += network/virtnetworkd.sysconf
-
 INSTALL_DATA_DIRS += network
 
 UUID=$(shell uuidgen 2>/dev/null)
diff --git a/src/network/meson.build b/src/network/meson.build
index c27578d66b4..35391698d6d 100644
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -72,4 +72,9 @@ if conf.has('WITH_NETWORK')
     'name': 'virtnetworkd',
     'in_file': files('virtnetworkd.init.in'),
   }
+
+  sysconf_files += {
+    'name': 'virtnetworkd',
+    'file': files('virtnetworkd.sysconf'),
+  }
 endif
diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc.am
index e6fcbf6c9e5..63d2548e11f 100644
--- a/src/node_device/Makefile.inc.am
+++ b/src/node_device/Makefile.inc.am
@@ -9,8 +9,3 @@ DRIVER_SOURCE_FILES += \
 STATEFUL_DRIVER_SOURCE_FILES += \
 	$(addprefix $(srcdir)/,$(NODE_DEVICE_DRIVER_SOURCES)) \
 	$(NULL)
-
-
-if WITH_NODE_DEVICES
-SYSCONF_FILES += node_device/virtnodedevd.sysconf
-endif WITH_NODE_DEVICES
diff --git a/src/node_device/meson.build b/src/node_device/meson.build
index d73867148ea..437924466eb 100644
--- a/src/node_device/meson.build
+++ b/src/node_device/meson.build
@@ -65,4 +65,9 @@ if conf.has('WITH_NODE_DEVICES')
     'name': 'virtnodedevd',
     'in_file': files('virtnodedevd.init.in'),
   }
+
+  sysconf_files += {
+    'name': 'virtnodedevd',
+    'file': files('virtnodedevd.sysconf'),
+  }
 endif
diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am
index 8fcd63cbbf9..4df4756adf7 100644
--- a/src/nwfilter/Makefile.inc.am
+++ b/src/nwfilter/Makefile.inc.am
@@ -11,6 +11,4 @@ if WITH_NWFILTER
 nwfilterxmldir = $(sysconfdir)/libvirt/nwfilter
 nwfilterxml_DATA = $(NWFILTER_XML_FILES)
 
-SYSCONF_FILES += nwfilter/virtnwfilterd.sysconf
-
 endif WITH_NWFILTER
diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build
index 744600a73d1..a832c2ddaeb 100644
--- a/src/nwfilter/meson.build
+++ b/src/nwfilter/meson.build
@@ -60,4 +60,9 @@ if conf.has('WITH_NWFILTER')
     'name': 'virtnwfilterd',
     'in_file': files('virtnwfilterd.init.in'),
   }
+
+  sysconf_files += {
+    'name': 'virtnwfilterd',
+    'file': files('virtnwfilterd.sysconf'),
+  }
 endif
diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am
index ec3178c373a..6d1e9e78148 100644
--- a/src/qemu/Makefile.inc.am
+++ b/src/qemu/Makefile.inc.am
@@ -4,7 +4,6 @@ DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOURCES))
 STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOURCES))
 
 if WITH_QEMU
-SYSCONF_FILES += qemu/virtqemud.sysconf
 
 INSTALL_DATA_DIRS += qemu
 
diff --git a/src/qemu/meson.build b/src/qemu/meson.build
index 09b72335741..a7a7b4801ca 100644
--- a/src/qemu/meson.build
+++ b/src/qemu/meson.build
@@ -152,4 +152,9 @@ if conf.has('WITH_QEMU')
     'name': 'virtqemud',
     'in_file': files('virtqemud.init.in'),
   }
+
+  sysconf_files += {
+    'name': 'virtqemud',
+    'file': files('virtqemud.sysconf'),
+  }
 endif
diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 73f7578ee5e..14c7a8e4141 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -7,11 +7,6 @@ LOGROTATE_FILES_IN += \
 	remote/libvirtd.logrotate.in \
 	$(NULL)
 
-SYSCONF_FILES += \
-	remote/libvirtd.sysconf \
-	remote/virtproxyd.sysconf \
-	$(NULL)
-
 if WITH_LIBVIRTD
 
 INSTALL_DATA_DIRS += remote
diff --git a/src/remote/meson.build b/src/remote/meson.build
index 0310ad232aa..cc5a24d1e68 100644
--- a/src/remote/meson.build
+++ b/src/remote/meson.build
@@ -152,6 +152,11 @@ if conf.has('WITH_REMOTE')
       'confd': files('libvirtd.confd'),
     }
 
+    sysconf_files += {
+      'name': 'libvirtd',
+      'file': files('libvirtd.sysconf'),
+    }
+
     virt_daemons += {
       'name': 'virtproxyd',
       'c_args': [
@@ -182,6 +187,11 @@ if conf.has('WITH_REMOTE')
       'in_file': files('virtproxyd.init.in'),
       'confd': files('virtproxyd.confd'),
     }
+
+    sysconf_files += {
+      'name': 'virtproxyd',
+      'file': files('virtproxyd.sysconf'),
+    }
   endif
 endif
 
diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am
index dd38e6888cd..a60a6b507f4 100644
--- a/src/secret/Makefile.inc.am
+++ b/src/secret/Makefile.inc.am
@@ -3,7 +3,3 @@
 DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES))
 STATEFUL_DRIVER_SOURCE_FILES += \
 	$(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES))
-
-if WITH_SECRETS
-SYSCONF_FILES += secret/virtsecretd.sysconf
-endif WITH_SECRETS
diff --git a/src/secret/meson.build b/src/secret/meson.build
index 3b3f999f758..2245790f796 100644
--- a/src/secret/meson.build
+++ b/src/secret/meson.build
@@ -42,4 +42,9 @@ if conf.has('WITH_SECRETS')
     'name': 'virtsecretd',
     'in_file': files('virtsecretd.init.in'),
   }
+
+  sysconf_files += {
+    'name': 'virtsecretd',
+    'file': files('virtsecretd.sysconf'),
+  }
 endif
diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am
index 23576659785..d5438e8a71c 100644
--- a/src/storage/Makefile.inc.am
+++ b/src/storage/Makefile.inc.am
@@ -3,7 +3,3 @@
 DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES))
 STATEFUL_DRIVER_SOURCE_FILES += \
 	$(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES))
-
-if WITH_STORAGE
-SYSCONF_FILES += storage/virtstoraged.sysconf
-endif WITH_STORAGE
diff --git a/src/storage/meson.build b/src/storage/meson.build
index 7a1ed9f4b81..59024746322 100644
--- a/src/storage/meson.build
+++ b/src/storage/meson.build
@@ -140,6 +140,11 @@ if conf.has('WITH_STORAGE')
     'name': 'virtstoraged',
     'in_file': files('virtstoraged.init.in'),
   }
+
+  sysconf_files += {
+    'name': 'virtstoraged',
+    'file': files('virtstoraged.sysconf'),
+  }
 endif
 
 if conf.has('WITH_STORAGE_DISK')
diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am
index 28bc3c4a585..6197c3172b5 100644
--- a/src/vbox/Makefile.inc.am
+++ b/src/vbox/Makefile.inc.am
@@ -4,7 +4,3 @@ DRIVER_SOURCE_FILES += \
 	$(addprefix $(srcdir)/,$(VBOX_DRIVER_SOURCES)) \
 	$(srcdir)/vbox/vbox_tmpl.c \
 	$(NULL)
-
-if WITH_VBOX
-SYSCONF_FILES += vbox/virtvboxd.sysconf
-endif WITH_VBOX
diff --git a/src/vbox/meson.build b/src/vbox/meson.build
index f1b8012777f..b6dcee279b9 100644
--- a/src/vbox/meson.build
+++ b/src/vbox/meson.build
@@ -65,4 +65,9 @@ if conf.has('WITH_VBOX')
     'name': 'virtvboxd',
     'in_file': files('virtvboxd.init.in'),
   }
+
+  sysconf_files += {
+    'name': 'virtvboxd',
+    'file': files('virtvboxd.sysconf'),
+  }
 endif
diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am
index 7e7d402a7f0..380d1ffb839 100644
--- a/src/vz/Makefile.inc.am
+++ b/src/vz/Makefile.inc.am
@@ -2,8 +2,3 @@
 
 DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURCES))
 STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURCES))
-
-
-if WITH_VZ
-SYSCONF_FILES += vz/virtvzd.sysconf
-endif WITH_VZ
diff --git a/src/vz/meson.build b/src/vz/meson.build
index fde1e937f35..9e8ac3f8cfc 100644
--- a/src/vz/meson.build
+++ b/src/vz/meson.build
@@ -57,4 +57,9 @@ if conf.has('WITH_VZ')
     'name': 'virtvzd',
     'in_file': files('virtvzd.init.in'),
   }
+
+  sysconf_files += {
+    'name': 'virtvzd',
+    'file': files('virtvzd.sysconf'),
+  }
 endif
-- 
2.26.2




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux