meson: src: install libvirt daemon sysconf files

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index d199190a4079e3f1b95121644f38ebbd4b366c00..9865b2d28ea573103798d33bf269ed905599c80d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -35,11 +35,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
@@ -205,23 +203,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=%)
 
 BUILT_SOURCES += $(LOGROTATE_FILES)

diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am
index f6626c7f491ffe5500998e06cfb09ac42f17a6ee..06bd8f820b13462a8acb5386168a6a6a3e2da279 100644 (file)
--- 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 dbf0599b6418ce91087d2c3913a550c855828104..89e3ebdead2a874f43d81c04c3bb35952bb13532 100644 (file)
--- a/src/interface/meson.build
+++ b/src/interface/meson.build
@@ -52,4 +52,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 9a33eb5f06b647fdb0aa98d8c2f789959005a420..0031adb2ef3e964ed76271de04c4aa35115aa5ab 100644 (file)
--- 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 be644cab632ee19000b5cedcfdb4cc238a4267c1..5c1a533cefb0244b1be1f71f2b24793e19aef17c 100644 (file)
--- a/src/libxl/meson.build
+++ b/src/libxl/meson.build
@@ -71,4 +71,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 8a0ecd8d1f2d9e8314502f3bc753ad7d6062218c..02ce2fa7a77f3fed096e3845c2ab320df49d6962 100644 (file)
--- 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 f560c9b44b909378c1c203b4da5ba993327647e7..1d42682d6086262bb6fa79abeefaa81ad4a9b845 100644 (file)
--- 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 (file)
index 48cae3a..0000000
--- 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 a689ea5ab88276be62e889e17ca4c1ee5b807b04..1f06a51e935647f34ddfddd7ddc8d707d3ba14d5 100644 (file)
--- a/src/logging/meson.build
+++ b/src/logging/meson.build
@@ -93,6 +93,11 @@ if conf.has('WITH_LIBVIRTD')
     'name': 'virtlogd',
     'in_file': files('virtlogd.init.in'),
   }
+
+  sysconf_files += {
+    'name': 'virtlogd',
+    'file': files('virtlogd.sysconf'),
+  }
 endif
 
 log_inc_dir = include_directories('.')

diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am
index 3cf6f96ea1d6be96f7846ec495a1b2529a05c2fa..f65b1cdf6b921da05f35cc011f14b10270e5ffa1 100644 (file)
--- 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 9117562e694e8d9ba39596bbe997407f4937184a..c8a5a9db9b2311e54ac8b8d130eeaba808530d81 100644 (file)
--- a/src/lxc/meson.build
+++ b/src/lxc/meson.build
@@ -154,4 +154,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 b6a10ac265f2f23b75a1a530013bdf74d50b8ebd..58687b331a1537db568a9ade7c6a8e74681bcd7c 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -205,6 +205,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
 
@@ -786,3 +792,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 81971c64ed4bff612ef985d8fe053b70174d46d3..2202903870fa542f328fc92ea548909416a7e42f 100644 (file)
--- 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 f6380e250501a21e8317f26149ceeb585ff0c213..1b2536cfabfc3586d9940c23065266e9350f028c 100644 (file)
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -71,4 +71,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 e6fcbf6c9e54569157181c7df37ace1a0f64c6da..63d2548e11f133a674a959b4fbca0c4e93bc2f2a 100644 (file)
--- 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 386d8bc4a4bd7e20127abdffda8a87c1947e8ba0..31e968a6d64d31e804226b5351a3fb5c2ff3c2d0 100644 (file)
--- a/src/node_device/meson.build
+++ b/src/node_device/meson.build
@@ -64,4 +64,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 8fcd63cbbf98755e892a87b145008514333edb11..4df4756adf759cc63f8342875dd6c9f7328dbbcc 100644 (file)
--- 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 e6667714b530e2fcf00753126b9dd9d696572678..5e0ded5be01635fc6f733d0f8e25e98b72411cc2 100644 (file)
--- a/src/nwfilter/meson.build
+++ b/src/nwfilter/meson.build
@@ -59,4 +59,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 ec3178c373ae42dd8de14fcc0da22d27f103c712..6d1e9e78148f83e35c7b8b84d81846a7a5d49a6e 100644 (file)
--- 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 f55018f3f5d99a250ea61036862afe705ac88038..8f8a8d6f5499de7a1b5b65dce8c7b97f6998f27d 100644 (file)
--- a/src/qemu/meson.build
+++ b/src/qemu/meson.build
@@ -155,4 +155,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 73f7578ee5e3e88580ce4db26054acabcf3b6fe8..14c7a8e4141222adbd1d8f68dce2e2cc1cc2da31 100644 (file)
--- 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 f03368bd9965b4ccec6c912d390aa4beadcb57ce..d7473eaeeca80cbc9737be66d0ee6ee0fa480f62 100644 (file)
--- a/src/remote/meson.build
+++ b/src/remote/meson.build
@@ -170,6 +170,11 @@ if conf.has('WITH_REMOTE')
       'confd': files('libvirtd.confd'),
     }
 
+    sysconf_files += {
+      'name': 'libvirtd',
+      'file': files('libvirtd.sysconf'),
+    }
+
     virt_daemons += {
       'name': 'virtproxyd',
       'c_args': [
@@ -199,6 +204,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 dd38e6888cd84bf4d753b08ad864feb04ee9cb68..a60a6b507f4137db726ccd9e6540042fb1c9b8e5 100644 (file)
--- 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 4b7c99ade5d3a1086338339525be907037381dcb..0c7949aa41284e9b6f8fe63ea20dec016968bf3c 100644 (file)
--- a/src/secret/meson.build
+++ b/src/secret/meson.build
@@ -41,4 +41,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 23576659785f4cb1723c3b713e872e2b463c43d1..d5438e8a71c275e9707f662efdfe18d9ac1765aa 100644 (file)
--- 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 9940b0a73e4c8531a8b94f34fac6a14c0ed332d8..52b7b3b2766c2bbe2eca52fcf09d766ddbc37780 100644 (file)
--- a/src/storage/meson.build
+++ b/src/storage/meson.build
@@ -139,6 +139,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 28bc3c4a585a050944449e9d3a071bb78e163d3c..6197c3172b5509fa07885625b537a0b84e8484be 100644 (file)
--- 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 4f9174152b26e618bbb1b02d27ce03598cce5979..ddd53f99915788ace311b70ad9b081aade9c2ae4 100644 (file)
--- a/src/vbox/meson.build
+++ b/src/vbox/meson.build
@@ -64,4 +64,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 7e7d402a7f0ab3149e529b1a37789f9904945f74..380d1ffb83969119f8c8b5b813b1f9a95b20931e 100644 (file)
--- 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 3c94fc907cbdaed4753d8d6f2dbc2a6a5bd8fc87..1f54c1f4d92a39168298ab59c4b52b92f415559a 100644 (file)
--- a/src/vz/meson.build
+++ b/src/vz/meson.build
@@ -56,4 +56,9 @@ if conf.has('WITH_VZ')
     'name': 'virtvzd',
     'in_file': files('virtvzd.init.in'),
   }
+
+  sysconf_files += {
+    'name': 'virtvzd',
+    'file': files('virtvzd.sysconf'),
+  }
 endif